arm: dts: exynos4x12: fix the minor things

PATCH New Jaehoon Chung 3 participants 15 messages Oct 24, 2016 – Oct 27, 2016

Subsystems (2)

Arm (32-bit) Arm Samsung Exynos

lore

Share & tools

lore

Jaehoon Chung

author

2016-10-24 06:08 UTC #0 lore raw

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 <[email protected]>

---
 arch/arm/dts/exynos4x12.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/dts/exynos4x12.dtsi +2 -2

index 5d58c6e..b83a0d3 100644
@@ -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 at 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>;

Signature · 1 line

2.10.1

Jaehoon Chung

author

2016-10-24 06:08 UTC #1 lore raw

PATCH 2/5 arm: dts: exynos4x12: remove the dupulicated node

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 <[email protected]>

---
 arch/arm/dts/exynos4x12.dtsi | 13 -------------
 1 file changed, 13 deletions(-)

arch/arm/dts/exynos4x12.dtsi +0 ~~-13~~

index b83a0d3..e5ac15a 100644
@@ -27,7 +27,6 @@
 		pinctrl1 = &pinctrl_1;
 		pinctrl2 = &pinctrl_2;
 		pinctrl3 = &pinctrl_3;
-		mshc0 = &mshc_0;
 	};
 
 	pd_isp: isp-power-domain at 10023CA0 {

@@ -100,16 +99,4 @@
 		clock-names = "sclk_fimg2d", "fimg2d";
 		status = "disabled";
 	};
-
-	mshc_0: mmc at 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";
-	};
 };

Signature · 1 line

2.10.1

Simon Glass

2016-10-26 16:31 UTC #2 lore raw

PATCH 2/5 arm: dts: exynos4x12: remove the dupulicated node

Quoted 1 line · Jaehoon Chung

mshc_0 node should be overwriten the defined node in exynos4.dtsi.

I think you mean 'The mshc_0 node overwrites the defined node...'

Quoted 1 line

It's meaningless. So removed this node. Instead, use the node in exynos4.dtsi.

'So remove this node'

Quoted 5 lines

Signed-off-by Jaehoon Chung <[email protected]>
---
 arch/arm/dts/exynos4x12.dtsi | 13 -------------
 1 file changed, 13 deletions(-)

Reviewed-by Simon Glass <[email protected]>

Jaehoon Chung

author

2016-10-27 01:55 UTC #3 lore raw

PATCH 2/5 arm: dts: exynos4x12: remove the dupulicated node

Quoted 8 lines · Simon Glass

Quoted 1 line · Jaehoon Chung
mshc_0 node should be overwriten the defined node in exynos4.dtsi.
I think you mean 'The mshc_0 node overwrites the defined node...'
Quoted 1 line
It's meaningless. So removed this node. Instead, use the node in exynos4.dtsi.
'So remove this node'

Will fix

Quoted 11 lines

Quoted 6 lines
Signed-off-by Jaehoon Chung <[email protected]>
---
 arch/arm/dts/exynos4x12.dtsi | 13 -------------
 1 file changed, 13 deletions(-)
Reviewed-by Simon Glass <[email protected]>

Jaehoon Chung

author

2016-10-24 06:08 UTC #4 lore raw

PATCH 3/5 arm: dts: exynos4: change the compatible to meaning name

In reply to Jaehoon Chung

Changed the compatible from generic thing to meaning compatible. "samsung,exynos-mmc" should be removed.

Signed-off-by Jaehoon Chung <[email protected]>

---
 arch/arm/dts/exynos4.dtsi | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

arch/arm/dts/exynos4.dtsi +15 ~~-10~~

index 7de227c..312133c 100644
@@ -111,44 +111,49 @@
 		interrupts = <7 63 0>;
 	};
 
-	sdhci at 12510000 {
+	sdhci0: sdhci at 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 at 12520000 {
+	sdhci1: sdhci at 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 at 12530000 {
+	sdhci2: sdhci at 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 at 12540000 {
+	sdhci3: sdhci at 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 at 12550000 {
+	mshc_0: dwmmc at 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";
 	};
 
 };

Signature · 1 line

2.10.1

Simon Glass

2016-10-26 16:31 UTC #5 lore raw

PATCH 3/5 arm: dts: exynos4: change the compatible to meaning name

Quoted 7 lines · Jaehoon Chung

Changed the compatible from generic thing to meaning compatible. "samsung,exynos-mmc" should be removed.
Signed-off-by Jaehoon Chung <[email protected]>
---
 arch/arm/dts/exynos4.dtsi | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

Reviewed-by Simon Glass <[email protected]>

Does the drivers need to change?

Jaehoon Chung

author

2016-10-27 01:58 UTC #6 lore raw

PATCH 3/5 arm: dts: exynos4: change the compatible to meaning name

Quoted 4 lines · Simon Glass

Quoted 3 lines · Jaehoon Chung
Changed the compatible from generic thing to meaning compatible. "samsung,exynos-mmc" should be removed.

Quoted 8 lines

Quoted 4 lines
Signed-off-by Jaehoon Chung <[email protected]>
---
 arch/arm/dts/exynos4.dtsi | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)
Reviewed-by Simon Glass <[email protected]>
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

Quoted 3 lines

Jaehoon Chung

author

2016-10-24 06:08 UTC #7 lore raw

PATCH 4/5 arm: dts: exynos4: change to use their parent node

In reply to Jaehoon Chung

Didn't overwrite the node. Just reuse the parent node. And add the Exynos Series specific properties.

Signed-off-by Jaehoon Chung <[email protected]>

---
 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(-)

arch/arm/dts/exynos4210-origen.dts +6 ~~-18~~

index 26c4d7f..a13d033 100644
@@ -22,24 +22,12 @@
 	aliases {
 		serial0 = "/serial at 13800000";
 		console = "/serial at 13820000";
-		mmc2 = "/sdhci at 12530000";
-	};
-
-	sdhci at 12510000 {
-		status = "disabled";
-	};
-
-	sdhci at 12520000 {
-		status = "disabled";
-	};
-
-	sdhci at 12530000 {
-		samsung,bus-width = <4>;
-		samsung,timing = <1 2 3>;
-		cd-gpios = <&gpk2 2 0>;
 	};
+};
 
-	sdhci at 12540000 {
-		status = "disabled";
-	};
+&sdhci2 {
+	samsung,bus-width = <4>;
+	samsung,timing = <1 2 3>;
+	cd-gpios = <&gpk2 2 0>;
+	status = "okay";
 };

arch/arm/dts/exynos4210-trats.dts +12 ~~-25~~

index 2ed38f3..8154ca8 100644
@@ -29,8 +29,6 @@
 		i2c7 = "/i2c at 138d0000";
 		serial0 = "/serial at 13800000";
 		console = "/serial at 13820000";
-		mmc0 = "/sdhci at 12510000";
-		mmc2 = "/sdhci at 12530000";
 	};
 
 	fimd at 11c00000 {

@@ -97,28 +95,17 @@
 
 		samsung,dsim-device-reverse-panel = <1>;
 	};
+};
 
-	sdhci at 12510000 {
-		samsung,bus-width = <8>;
-		samsung,timing = <1 3 3>;
-		pwr-gpios = <&gpk0 2 0>;
-	};
-
-	sdhci at 12520000 {
-		status = "disabled";
-	};
-
-	sdhci at 12530000 {
-		samsung,bus-width = <4>;
-		samsung,timing = <1 2 3>;
-		cd-gpios = <&gpx3 4 0>;
-	};
-
-	sdhci at 12540000 {
-		status = "disabled";
-	};
-
-	dwmmc at 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";
 };

arch/arm/dts/exynos4210-universal_c210.dts +14 ~~-22~~

index 8cac7dd..c6dda42 100644
@@ -17,28 +17,6 @@
 	aliases {
 		serial0 = "/serial at 13800000";
 		console = "/serial at 13820000";
-		mmc0 = "/sdhci at 12510000";
-		mmc2 = "/sdhci at 12530000";
-	};
-
-	sdhci at 12510000 {
-		samsung,bus-width = <8>;
-		samsung,timing = <1 3 3>;
-		pwr-gpios = <&gpk0 2 0>;
-	};
-
-	sdhci at 12520000 {
-		status = "disabled";
-	};
-
-	sdhci at 12530000 {
-		samsung,bus-width = <4>;
-		samsung,timing = <1 2 3>;
-		cd-gpios = <&gpx3 4 0>;
-	};
-
-	sdhci at 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";
+};

arch/arm/dts/exynos4412-odroid.dts +18 ~~-28~~

55 lines not on this page · raw message

arch/arm/dts/exynos4412-trats2.dts +23 ~~-31~~

67 lines not on this page · raw message

Signature · 1 line

2.10.1

Simon Glass

2016-10-26 16:31 UTC #8 lore raw

PATCH 4/5 arm: dts: exynos4: change to use their parent node

Quoted 11 lines · Jaehoon Chung

Didn't overwrite the node. Just reuse the parent node. And add the Exynos Series specific properties.

Signed-off-by Jaehoon Chung <[email protected]>

---
 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 <[email protected]>

Presumably (as Tom asks) these are syncing up with the kernel?

- Simon

Jaehoon Chung

author

2016-10-27 01:58 UTC #9 lore raw

PATCH 4/5 arm: dts: exynos4: change to use their parent node

Quoted 13 lines · Simon Glass

Quoted 11 lines · Jaehoon Chung
Didn't overwrite the node. Just reuse the parent node. And add the Exynos Series specific properties.
Signed-off-by Jaehoon Chung <[email protected]>
---
 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(-)

Quoted 3 lines

Reviewed-by Simon Glass <[email protected]>
Presumably (as Tom asks) these are syncing up with the kernel?

Will resend. Thanks!

Quoted 5 lines

- Simon

Jaehoon Chung

author

2016-10-24 06:08 UTC #10 lore raw

PATCH 5/5 configs: add the CONFIG_BLK and CONFIG_DM_MMC/OPS for exynos4 series

In reply to Jaehoon Chung

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 <[email protected]>

---
 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(+)

configs/odroid_defconfig +3 -0

index 76d0968..969d777 100644
@@ -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

configs/origen_defconfig +3 -0

index d667b0f..5b582ff 100644
@@ -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

configs/smdkv310_defconfig +3 -0

index c8c182b..52c3cc7 100644
@@ -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

configs/trats2_defconfig +3 -0

index 59b73ca..b6f6bf8 100644
@@ -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

configs/trats_defconfig +3 -0

index 2773654..26adb1f 100644
@@ -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

Signature · 1 line

2.10.1

Simon Glass

2016-10-26 16:31 UTC #11 lore raw

PATCH 5/5 configs: add the CONFIG_BLK and CONFIG_DM_MMC/OPS for exynos4 series

Quoted 11 lines · Jaehoon Chung

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 <[email protected]>
---
 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 <[email protected]>

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

Jaehoon Chung

author

2016-10-27 01:58 UTC #12 lore raw

PATCH 5/5 configs: add the CONFIG_BLK and CONFIG_DM_MMC/OPS for exynos4 series

Quoted 13 lines · Simon Glass

Quoted 11 lines · Jaehoon Chung
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 <[email protected]>
---
 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(+)

Quoted 5 lines

Reviewed-by Simon Glass <[email protected]>
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

Quoted 5 lines

- Simon

Tom Rini

2016-10-24 23:04 UTC #13 lore raw

PATCH 1/5 arm: dts: exynos4x12: fix the minor things

In reply to Jaehoon Chung

Quoted 8 lines · Jaehoon Chung

Fixed the minor things.
1. Removed '`' thing in comments
2. Fix the wrong interrupts value from 77 to 131
Signed-off-by Jaehoon Chung <[email protected]>
---
 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.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161024/58c81743/attachment.sig>

Jaehoon Chung

author

2016-10-27 01:55 UTC #14 lore raw

PATCH 1/5 arm: dts: exynos4x12: fix the minor things

Quoted 6 lines · Tom Rini

Quoted 4 lines · Jaehoon Chung
Fixed the minor things.
1. Removed '`' thing in comments
2. Fix the wrong interrupts value from 77 to 131

Quoted 8 lines

Quoted 4 lines
Signed-off-by Jaehoon Chung <[email protected]>
---
 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

Quoted 1 line