[U-Boot] [PATCH 1/5] arm: dts: exynos4x12: fix the minor things
Fixed the minor things. 1. Removed '`' thing in comments 2. Fix the wrong interrupts value from 77 to 131
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com --- arch/arm/dts/exynos4x12.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/exynos4x12.dtsi b/arch/arm/dts/exynos4x12.dtsi index 5d58c6e..b83a0d3 100644 --- a/arch/arm/dts/exynos4x12.dtsi +++ b/arch/arm/dts/exynos4x12.dtsi @@ -14,7 +14,7 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as -` * published by the Free Software Foundation. + * published by the Free Software Foundation. */
#include "exynos4.dtsi" @@ -104,7 +104,7 @@ mshc_0: mmc@12550000 { compatible = "samsung,exynos4412-dw-mshc"; reg = <0x12550000 0x1000>; - interrupts = <0 77 0>; + interrupts = <0 131 0>; #address-cells = <1>; #size-cells = <0>; fifo-depth = <0x80>;
mshc_0 node should be overwriten the defined node in exynos4.dtsi. It's meaningless. So removed this node. Instead, use the node in exynos4.dtsi.
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com --- arch/arm/dts/exynos4x12.dtsi | 13 ------------- 1 file changed, 13 deletions(-)
diff --git a/arch/arm/dts/exynos4x12.dtsi b/arch/arm/dts/exynos4x12.dtsi index b83a0d3..e5ac15a 100644 --- a/arch/arm/dts/exynos4x12.dtsi +++ b/arch/arm/dts/exynos4x12.dtsi @@ -27,7 +27,6 @@ pinctrl1 = &pinctrl_1; pinctrl2 = &pinctrl_2; pinctrl3 = &pinctrl_3; - mshc0 = &mshc_0; };
pd_isp: isp-power-domain@10023CA0 { @@ -100,16 +99,4 @@ clock-names = "sclk_fimg2d", "fimg2d"; status = "disabled"; }; - - mshc_0: mmc@12550000 { - compatible = "samsung,exynos4412-dw-mshc"; - reg = <0x12550000 0x1000>; - interrupts = <0 131 0>; - #address-cells = <1>; - #size-cells = <0>; - fifo-depth = <0x80>; - clocks = <&clock 301>, <&clock 149>; - clock-names = "biu", "ciu"; - status = "disabled"; - }; };
On 23 October 2016 at 23:08, Jaehoon Chung jh80.chung@samsung.com wrote:
mshc_0 node should be overwriten the defined node in exynos4.dtsi.
I think you mean 'The mshc_0 node overwrites the defined node...'
It's meaningless. So removed this node. Instead, use the node in exynos4.dtsi.
'So remove this node'
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com
arch/arm/dts/exynos4x12.dtsi | 13 ------------- 1 file changed, 13 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On 10/27/2016 01:31 AM, Simon Glass wrote:
On 23 October 2016 at 23:08, Jaehoon Chung jh80.chung@samsung.com wrote:
mshc_0 node should be overwriten the defined node in exynos4.dtsi.
I think you mean 'The mshc_0 node overwrites the defined node...'
It's meaningless. So removed this node. Instead, use the node in exynos4.dtsi.
'So remove this node'
Will fix
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com
arch/arm/dts/exynos4x12.dtsi | 13 ------------- 1 file changed, 13 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Changed the compatible from generic thing to meaning compatible. "samsung,exynos-mmc" should be removed.
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com --- arch/arm/dts/exynos4.dtsi | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/arch/arm/dts/exynos4.dtsi b/arch/arm/dts/exynos4.dtsi index 7de227c..312133c 100644 --- a/arch/arm/dts/exynos4.dtsi +++ b/arch/arm/dts/exynos4.dtsi @@ -111,44 +111,49 @@ interrupts = <7 63 0>; };
- sdhci@12510000 { + sdhci0: sdhci@12510000 { #address-cells = <1>; #size-cells = <0>; - compatible = "samsung,exynos-mmc"; + compatible = "samsung,exynos4412-sdhci"; reg = <0x12510000 0x1000>; interrupts = <0 75 0>; + status = "disabled"; };
- sdhci@12520000 { + sdhci1: sdhci@12520000 { #address-cells = <1>; #size-cells = <0>; - compatible = "samsung,exynos-mmc"; + compatible = "samsung,exynos4412-sdhci"; reg = <0x12520000 0x1000>; interrupts = <0 76 0>; + status = "disabled"; };
- sdhci@12530000 { + sdhci2: sdhci@12530000 { #address-cells = <1>; #size-cells = <0>; - compatible = "samsung,exynos-mmc"; + compatible = "samsung,exynos4412-sdhci"; reg = <0x12530000 0x1000>; interrupts = <0 77 0>; + status = "disabled"; };
- sdhci@12540000 { + sdhci3: sdhci@12540000 { #address-cells = <1>; #size-cells = <0>; - compatible = "samsung,exynos-mmc"; + compatible = "samsung,exynos4412-sdhci"; reg = <0x12540000 0x1000>; interrupts = <0 78 0>; + status = "disabled"; };
- dwmmc@12550000 { + mshc_0: dwmmc@12550000 { #address-cells = <1>; #size-cells = <0>; - compatible = "samsung,exynos-dwmmc"; + compatible = "samsung,exynos4412-dw-mshc"; reg = <0x12550000 0x1000>; interrupts = <0 131 0>; + status = "disabled"; };
};
On 23 October 2016 at 23:08, Jaehoon Chung jh80.chung@samsung.com wrote:
Changed the compatible from generic thing to meaning compatible. "samsung,exynos-mmc" should be removed.
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com
arch/arm/dts/exynos4.dtsi | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Does the drivers need to change?
On 10/27/2016 01:31 AM, Simon Glass wrote:
On 23 October 2016 at 23:08, Jaehoon Chung jh80.chung@samsung.com wrote:
Changed the compatible from generic thing to meaning compatible. "samsung,exynos-mmc" should be removed.
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com
arch/arm/dts/exynos4.dtsi | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Does the drivers need to change?
Already prepared to use these. On MMC of exynos, drivers can use both with legacy and DM.
When it changes to DM, i will remove everything relevant to legacy for exynos.
Best Regards, Jaehoon Chung
Didn't overwrite the node. Just reuse the parent node. And add the Exynos Series specific properties.
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com --- arch/arm/dts/exynos4210-origen.dts | 24 ++++--------- arch/arm/dts/exynos4210-trats.dts | 37 +++++++------------- arch/arm/dts/exynos4210-universal_c210.dts | 36 ++++++++------------ arch/arm/dts/exynos4412-odroid.dts | 46 ++++++++++--------------- arch/arm/dts/exynos4412-trats2.dts | 54 +++++++++++++----------------- 5 files changed, 73 insertions(+), 124 deletions(-)
diff --git a/arch/arm/dts/exynos4210-origen.dts b/arch/arm/dts/exynos4210-origen.dts index 26c4d7f..a13d033 100644 --- a/arch/arm/dts/exynos4210-origen.dts +++ b/arch/arm/dts/exynos4210-origen.dts @@ -22,24 +22,12 @@ aliases { serial0 = "/serial@13800000"; console = "/serial@13820000"; - mmc2 = "/sdhci@12530000"; - }; - - sdhci@12510000 { - status = "disabled"; - }; - - sdhci@12520000 { - status = "disabled"; - }; - - sdhci@12530000 { - samsung,bus-width = <4>; - samsung,timing = <1 2 3>; - cd-gpios = <&gpk2 2 0>; }; +};
- sdhci@12540000 { - status = "disabled"; - }; +&sdhci2 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpk2 2 0>; + status = "okay"; }; diff --git a/arch/arm/dts/exynos4210-trats.dts b/arch/arm/dts/exynos4210-trats.dts index 2ed38f3..8154ca8 100644 --- a/arch/arm/dts/exynos4210-trats.dts +++ b/arch/arm/dts/exynos4210-trats.dts @@ -29,8 +29,6 @@ i2c7 = "/i2c@138d0000"; serial0 = "/serial@13800000"; console = "/serial@13820000"; - mmc0 = "/sdhci@12510000"; - mmc2 = "/sdhci@12530000"; };
fimd@11c00000 { @@ -97,28 +95,17 @@
samsung,dsim-device-reverse-panel = <1>; }; +};
- sdhci@12510000 { - samsung,bus-width = <8>; - samsung,timing = <1 3 3>; - pwr-gpios = <&gpk0 2 0>; - }; - - sdhci@12520000 { - status = "disabled"; - }; - - sdhci@12530000 { - samsung,bus-width = <4>; - samsung,timing = <1 2 3>; - cd-gpios = <&gpx3 4 0>; - }; - - sdhci@12540000 { - status = "disabled"; - }; - - dwmmc@12550000 { - status = "disabled"; - }; +&sdhci0 { + samsung,bus-width = <8>; + samsung,timing = <1 3 3>; + pwr-gpios = <&gpk0 2 0>; + status = "okay"; +}; +&sdhci2 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpx3 4 0>; + status = "okay"; }; diff --git a/arch/arm/dts/exynos4210-universal_c210.dts b/arch/arm/dts/exynos4210-universal_c210.dts index 8cac7dd..c6dda42 100644 --- a/arch/arm/dts/exynos4210-universal_c210.dts +++ b/arch/arm/dts/exynos4210-universal_c210.dts @@ -17,28 +17,6 @@ aliases { serial0 = "/serial@13800000"; console = "/serial@13820000"; - mmc0 = "/sdhci@12510000"; - mmc2 = "/sdhci@12530000"; - }; - - sdhci@12510000 { - samsung,bus-width = <8>; - samsung,timing = <1 3 3>; - pwr-gpios = <&gpk0 2 0>; - }; - - sdhci@12520000 { - status = "disabled"; - }; - - sdhci@12530000 { - samsung,bus-width = <4>; - samsung,timing = <1 2 3>; - cd-gpios = <&gpx3 4 0>; - }; - - sdhci@12540000 { - status = "disabled"; };
soft-spi { @@ -94,3 +72,17 @@ samsung,rgb-mode = <0>; }; }; + +&sdhci0 { + samsung,bus-width = <8>; + samsung,timing = <1 3 3>; + pwr-gpios = <&gpk0 2 0>; + status = "okay"; +}; + +&sdhci2 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpx3 4 0>; + status = "okay"; +}; diff --git a/arch/arm/dts/exynos4412-odroid.dts b/arch/arm/dts/exynos4412-odroid.dts index 188cb93..4a2cfa9 100644 --- a/arch/arm/dts/exynos4412-odroid.dts +++ b/arch/arm/dts/exynos4412-odroid.dts @@ -224,34 +224,6 @@ status = "okay"; };
- sdhci@12510000 { - status = "disabled"; - }; - - sdhci@12520000 { - status = "disabled"; - }; - - sdhci@12530000 { - samsung,bus-width = <4>; - samsung,timing = <1 2 3>; - cd-gpios = <&gpk2 2 0>; - }; - - sdhci@12540000 { - status = "disabled"; - }; - - dwmmc@12550000 { - samsung,bus-width = <8>; - samsung,timing = <2 1 0>; - samsung,removable = <0>; - fifoth_val = <0x203f0040>; - bus_hz = <400000000>; - div = <0x3>; - index = <4>; - }; - ehci@12580000 { compatible = "samsung,exynos-ehci"; reg = <0x12580000 0x100>; @@ -268,3 +240,21 @@ reset-gpio = <&gpk1 2 0>; }; }; + +&sdhci2 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpk2 2 0>; + status = "okay"; +}; + +&mshc_0 { + samsung,bus-width = <8>; + samsung,timing = <2 1 0>; + samsung,removable = <0>; + fifoth_val = <0x203f0040>; + bus_hz = <400000000>; + div = <0x3>; + index = <4>; + status = "okay"; +}; diff --git a/arch/arm/dts/exynos4412-trats2.dts b/arch/arm/dts/exynos4412-trats2.dts index 1fbcf89..541f5da 100644 --- a/arch/arm/dts/exynos4412-trats2.dts +++ b/arch/arm/dts/exynos4412-trats2.dts @@ -29,9 +29,6 @@ i2c7 = "/i2c@138d0000"; serial0 = "/serial@13800000"; console = "/serial@13820000"; - mmc0 = "/sdhci@12510000"; - mmc2 = "/sdhci@12530000"; - mshc0 = "/dwmmc@12550000"; };
i2c@138d0000 { @@ -412,35 +409,30 @@
samsung,dsim-device-reverse-panel = <1>; }; +};
- sdhci@12510000 { - samsung,bus-width = <8>; - samsung,timing = <1 3 3>; - pwr-gpios = <&gpk0 4 0>; - status = "disabled"; - }; - - sdhci@12520000 { - status = "disabled"; - }; - - sdhci@12530000 { - samsung,bus-width = <4>; - samsung,timing = <1 2 3>; - cd-gpios = <&gpk2 2 0>; - }; +&sdhci0 { + samsung,bus-width = <8>; + samsung,timing = <1 3 3>; + pwr-gpios = <&gpk0 4 0>; + status = "disabled"; +};
- sdhci@12540000 { - status = "disabled"; - }; +&sdhci2 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpk2 2 0>; + status = "okay"; +};
- dwmmc@12550000 { - samsung,bus-width = <8>; - samsung,timing = <2 1 0>; - pwr-gpios = <&gpk0 4 0>; - fifoth_val = <0x203f0040>; - bus_hz = <400000000>; - div = <0x3>; - index = <4>; - }; +&mshc_0 { + samsung,bus-width = <8>; + samsung,timing = <2 1 0>; + samsung,removable = <0>; + fifoth_val = <0x203f0040>; + bus_hz = <400000000>; + div = <0x3>; + index = <4>; + fifo-depth = <0x80>; + status = "okay"; };
On 23 October 2016 at 23:08, Jaehoon Chung jh80.chung@samsung.com wrote:
Didn't overwrite the node. Just reuse the parent node. And add the Exynos Series specific properties.
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com
arch/arm/dts/exynos4210-origen.dts | 24 ++++--------- arch/arm/dts/exynos4210-trats.dts | 37 +++++++------------- arch/arm/dts/exynos4210-universal_c210.dts | 36 ++++++++------------ arch/arm/dts/exynos4412-odroid.dts | 46 ++++++++++--------------- arch/arm/dts/exynos4412-trats2.dts | 54 +++++++++++++----------------- 5 files changed, 73 insertions(+), 124 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Presumably (as Tom asks) these are syncing up with the kernel?
- Simon
On 10/27/2016 01:31 AM, Simon Glass wrote:
On 23 October 2016 at 23:08, Jaehoon Chung jh80.chung@samsung.com wrote:
Didn't overwrite the node. Just reuse the parent node. And add the Exynos Series specific properties.
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com
arch/arm/dts/exynos4210-origen.dts | 24 ++++--------- arch/arm/dts/exynos4210-trats.dts | 37 +++++++------------- arch/arm/dts/exynos4210-universal_c210.dts | 36 ++++++++------------ arch/arm/dts/exynos4412-odroid.dts | 46 ++++++++++--------------- arch/arm/dts/exynos4412-trats2.dts | 54 +++++++++++++----------------- 5 files changed, 73 insertions(+), 124 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Presumably (as Tom asks) these are syncing up with the kernel?
Will resend. Thanks!
- Simon
To use the CONFIG_BLK/CONFIG_DM_MMC/CONFIG_DM_MMC_OPS, add the configurations for exynos4 series.(by default)
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com --- configs/odroid_defconfig | 3 +++ configs/origen_defconfig | 3 +++ configs/smdkv310_defconfig | 3 +++ configs/trats2_defconfig | 3 +++ configs/trats_defconfig | 3 +++ 5 files changed, 15 insertions(+)
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index 76d0968..969d777 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -49,3 +49,6 @@ CONFIG_G_DNL_MANUFACTURER="Samsung" CONFIG_G_DNL_VENDOR_NUM=0x04e8 CONFIG_G_DNL_PRODUCT_NUM=0x6601 CONFIG_ERRNO_STR=y +CONFIG_BLK=y +CONFIG_DM_MMC=y +CONFIG_DM_MMC_OPS=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index d667b0f..5b582ff 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -35,3 +35,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Samsung" CONFIG_G_DNL_VENDOR_NUM=0x04e8 CONFIG_G_DNL_PRODUCT_NUM=0x6601 +CONFIG_BLK=y +CONFIG_DM_MMC=y +CONFIG_DM_MMC_OPS=y diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig index c8c182b..52c3cc7 100644 --- a/configs/smdkv310_defconfig +++ b/configs/smdkv310_defconfig @@ -24,3 +24,6 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_BLK=y +CONFIG_DM_MMC=y +CONFIG_DM_MMC_OPS=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index 59b73ca..b6f6bf8 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -38,3 +38,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Samsung" CONFIG_G_DNL_VENDOR_NUM=0x04e8 CONFIG_G_DNL_PRODUCT_NUM=0x6601 +CONFIG_BLK=y +CONFIG_DM_MMC=y +CONFIG_DM_MMC_OPS=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 2773654..26adb1f 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -37,3 +37,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Samsung" CONFIG_G_DNL_VENDOR_NUM=0x04e8 CONFIG_G_DNL_PRODUCT_NUM=0x6601 +CONFIG_BLK=y +CONFIG_DM_MMC=y +CONFIG_DM_MMC_OPS=y
On 23 October 2016 at 23:08, Jaehoon Chung jh80.chung@samsung.com wrote:
To use the CONFIG_BLK/CONFIG_DM_MMC/CONFIG_DM_MMC_OPS, add the configurations for exynos4 series.(by default)
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com
configs/odroid_defconfig | 3 +++ configs/origen_defconfig | 3 +++ configs/smdkv310_defconfig | 3 +++ configs/trats2_defconfig | 3 +++ configs/trats_defconfig | 3 +++ 5 files changed, 15 insertions(+)
Reviewed-by: Simon Glass sjg@chromium.org
But please use savedefconfig to get the ordering correct. A recent change should make DM_MMC and DM_MMC_OPS the default if BLK is enabled.
- Simon
On 10/27/2016 01:31 AM, Simon Glass wrote:
On 23 October 2016 at 23:08, Jaehoon Chung jh80.chung@samsung.com wrote:
To use the CONFIG_BLK/CONFIG_DM_MMC/CONFIG_DM_MMC_OPS, add the configurations for exynos4 series.(by default)
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com
configs/odroid_defconfig | 3 +++ configs/origen_defconfig | 3 +++ configs/smdkv310_defconfig | 3 +++ configs/trats2_defconfig | 3 +++ configs/trats_defconfig | 3 +++ 5 files changed, 15 insertions(+)
Reviewed-by: Simon Glass sjg@chromium.org
But please use savedefconfig to get the ordering correct. A recent change should make DM_MMC and DM_MMC_OPS the default if BLK is enabled.
Got it. Thanks!
Best Regards, Jaehoon Chung
- Simon
On Mon, Oct 24, 2016 at 03:08:53PM +0900, Jaehoon Chung wrote:
Fixed the minor things.
- Removed '`' thing in comments
- Fix the wrong interrupts value from 77 to 131
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com
arch/arm/dts/exynos4x12.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
For this and the rest of the series, are these problems present in the Linux Kernel or are you backporting fixes? If backporting you should note that, thanks.
On 10/25/2016 08:04 AM, Tom Rini wrote:
On Mon, Oct 24, 2016 at 03:08:53PM +0900, Jaehoon Chung wrote:
Fixed the minor things.
- Removed '`' thing in comments
- Fix the wrong interrupts value from 77 to 131
Signed-off-by: Jaehoon Chung jh80.chung@samsung.com
arch/arm/dts/exynos4x12.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
For this and the rest of the series, are these problems present in the Linux Kernel or are you backporting fixes? If backporting you should note that, thanks.
Thanks. I will recheck about your comments. But something might be my wrong. Now i'm checking the entire exynos4 series TRM.
And will resend the patch-set after adding the commit message in more details.
Best Regards, Jaehoon Chung
participants (3)
-
Jaehoon Chung -
Simon Glass -
Tom Rini