Skip to contentSkip to conversation

ARM: dts: exynos4210-origen: Device tree fixes

PATCH New Tomasz Figa 2 participants 7 messages Nov 19, 2012 – Nov 21, 2012

Subsystems (2)
Device tree bindings Arm Samsung Exynos
lore
Share & tools
lore

Tomasz Figa

author
#0 lore raw

cover ARM: dts: exynos4210-origen: Device tree fixes

This patch series fixes device tree support for Origen board:
- memory is defined using sections of maximum allowed size
- any pin configuration is modified to use pinctrl
- invalid properties in sdhci nodes are replaced according to current mmc bindings
- a fixed vmmc voltage regulator is added

Tested on Origen board.

Depends on:
[PATCH v2 0/2] mmc: host: sdhci-s3c: Add support for pinctrl interface

Tomasz Figa (4):
ARM: dts: exynos4210-origen: Split memory sections
ARM: dts: exynos4210-origen: Update for pinctrl-samsung driver
ARM: dts: exynos4210-origen: Update sdhci nodes for current bindings
ARM: dts: exynos4210-origen: Add vmmc fixed voltage regulator

 arch/arm/boot/dts/exynos4210-origen.dts | 54 ++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 27 deletions(-)
Signature · 1 line
1.8.0
author
#1 lore raw

PATCH 1/4 ARM: dts: exynos4210-origen: Split memory sections

This patch changes memory configuration defined in dts file of Origen board from single 1 GiB section into four 256 MiB sections to match section size limit.

Signed-off-by Tomasz Figa <[email protected]>
---
 arch/arm/boot/dts/exynos4210-origen.dts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm/boot/dts/exynos4210-origen.dts +4 -1
index f16c99f..392d9de 100644
@@ -22,7 +22,10 @@
 	compatible = "insignal,origen", "samsung,exynos4210";
 
 	memory {
-		reg = <0x40000000 0x40000000>;
+		reg =  <0x40000000 0x10000000
+			0x50000000 0x10000000
+			0x60000000 0x10000000
+			0x70000000 0x10000000>;
 	};
 
 	chosen {
Signature · 1 line
1.8.0
author
#2 lore raw

PATCH 2/4 ARM: dts: exynos4210-origen: Update for pinctrl-samsung driver

In reply to Tomasz Figa

This patch updates all parts of Origen dts related to pin configuration to use new GPIO and pinctrl bindings, instead of (now unsupported on Exynos4) legacy gpio-samsung bindings.

Signed-off-by Tomasz Figa <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 arch/arm/boot/dts/exynos4210-origen.dts | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)
arch/arm/boot/dts/exynos4210-origen.dts +10 -20
index 392d9de..2eb1332 100644
@@ -36,13 +36,8 @@
 		samsung,sdhci-bus-width = <4>;
 		linux,mmc_cap_4_bit_data;
 		samsung,sdhci-cd-internal;
-		gpio-cd = <&gpk2 2 2 3 3>;
-		gpios = <&gpk2 0 2 0 3>,
-			<&gpk2 1 2 0 3>,
-			<&gpk2 3 2 3 3>,
-			<&gpk2 4 2 3 3>,
-			<&gpk2 5 2 3 3>,
-			<&gpk2 6 2 3 3>;
+		pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>;
+		pinctrl-names = "default";
 		status = "okay";
 	};
 

@@ -50,13 +45,8 @@
 		samsung,sdhci-bus-width = <4>;
 		linux,mmc_cap_4_bit_data;
 		samsung,sdhci-cd-internal;
-		gpio-cd = <&gpk0 2 2 3 3>;
-		gpios = <&gpk0 0 2 0 3>,
-			<&gpk0 1 2 0 3>,
-			<&gpk0 3 2 3 3>,
-			<&gpk0 4 2 3 3>,
-			<&gpk0 5 2 3 3>,
-			<&gpk0 6 2 3 3>;
+		pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_cd>;
+		pinctrl-names = "default";
 		status = "okay";
 	};
 

@@ -83,35 +73,35 @@
 
 		up {
 			label = "Up";
-			gpios = <&gpx2 0 0 0x10000 2>;
+			gpios = <&gpx2 0 1>;
 			linux,code = <103>;
 			gpio-key,wakeup;
 		};
 
 		down {
 			label = "Down";
-			gpios = <&gpx2 1 0 0x10000 2>;
+			gpios = <&gpx2 1 1>;
 			linux,code = <108>;
 			gpio-key,wakeup;
 		};
 
 		back {
 			label = "Back";
-			gpios = <&gpx1 7 0 0x10000 2>;
+			gpios = <&gpx1 7 1>;
 			linux,code = <158>;
 			gpio-key,wakeup;
 		};
 
 		home {
 			label = "Home";
-			gpios = <&gpx1 6 0 0x10000 2>;
+			gpios = <&gpx1 6 1>;
 			linux,code = <102>;
 			gpio-key,wakeup;
 		};
 
 		menu {
 			label = "Menu";
-			gpios = <&gpx1 5 0 0x10000 2>;
+			gpios = <&gpx1 5 1>;
 			linux,code = <139>;
 			gpio-key,wakeup;
 		};

@@ -120,7 +110,7 @@
 	leds {
 		compatible = "gpio-leds";
 		status {
-			gpios = <&gpx1 3 0 0x10000 2>;
+			gpios = <&gpx1 3 1>;
 			linux,default-trigger = "heartbeat";
 		};
 	};
Signature · 1 line
1.8.0
author
#3 lore raw

PATCH 3/4 ARM: dts: exynos4210-origen: Update sdhci nodes for current bindings

In reply to Tomasz Figa

This patch modifies sdhci nodes present in Origen device tree source to use current generic mmc bindings.

Signed-off-by Tomasz Figa <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 arch/arm/boot/dts/exynos4210-origen.dts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
arch/arm/boot/dts/exynos4210-origen.dts +2 -6
index 2eb1332..5395875 100644
@@ -33,18 +33,14 @@
 	};
 
 	sdhci at 12530000 {
-		samsung,sdhci-bus-width = <4>;
-		linux,mmc_cap_4_bit_data;
-		samsung,sdhci-cd-internal;
+		bus-width = <4>;
 		pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>;
 		pinctrl-names = "default";
 		status = "okay";
 	};
 
 	sdhci at 12510000 {
-		samsung,sdhci-bus-width = <4>;
-		linux,mmc_cap_4_bit_data;
-		samsung,sdhci-cd-internal;
+		bus-width = <4>;
 		pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_cd>;
 		pinctrl-names = "default";
 		status = "okay";
Signature · 1 line
1.8.0
author
#4 lore raw

PATCH 4/4 ARM: dts: exynos4210-origen: Add vmmc fixed voltage regulator

In reply to Tomasz Figa

This patch adds fixed voltage vmmc regulator to dts file of Origen board.

Signed-off-by Tomasz Figa <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 arch/arm/boot/dts/exynos4210-origen.dts | 11 +++++++++++
 1 file changed, 11 insertions(+)
arch/arm/boot/dts/exynos4210-origen.dts +11 -0
index 5395875..62f278e 100644
@@ -32,10 +32,20 @@
 		bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";
 	};
 
+	mmc_reg: voltage-regulator {
+	        compatible = "regulator-fixed";
+		regulator-name = "VMEM_VDD_2.8V";
+		regulator-min-microvolt = <2800000>;
+		regulator-max-microvolt = <2800000>;
+		gpio = <&gpx1 1 0>;
+		enable-active-high;
+	};
+
 	sdhci at 12530000 {
 		bus-width = <4>;
 		pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>;
 		pinctrl-names = "default";
+		vmmc-supply = <&mmc_reg>;
 		status = "okay";
 	};
 

@@ -43,6 +53,7 @@
 		bus-width = <4>;
 		pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_cd>;
 		pinctrl-names = "default";
+		vmmc-supply = <&mmc_reg>;
 		status = "okay";
 	};
Signature · 1 line
1.8.0
author
#5 lore raw

cover ARM: dts: exynos4210-origen: Device tree fixes

In reply to Tomasz Figa

Hi Kgene,

Quoted 18 lines · On Monday 19 of November 2012 15:46:32 Tomasz Figa wrote:

This patch series fixes device tree support for Origen board:
- memory is defined using sections of maximum allowed size
- any pin configuration is modified to use pinctrl
- invalid properties in sdhci nodes are replaced according to current mmc bindings
- a fixed vmmc voltage regulator is added

Tested on Origen board.

Depends on:
[PATCH v2 0/2] mmc: host: sdhci-s3c: Add support for pinctrl interface

Tomasz Figa (4):
ARM: dts: exynos4210-origen: Split memory sections
ARM: dts: exynos4210-origen: Update for pinctrl-samsung driver
ARM: dts: exynos4210-origen: Update sdhci nodes for current bindings
ARM: dts: exynos4210-origen: Add vmmc fixed voltage regulator

Quoted 3 lines
 arch/arm/boot/dts/exynos4210-origen.dts | 54

++++++++++++++++----------------- 1 file changed, 27 insertions(+), 27 deletions(-)

Could you still pick these patches up for 3.8?

Best regards,

Signature · 3 lines
Tomasz Figa
Samsung Poland R&D Center
SW Solution Development, Linux Platform
#6 lore raw

cover ARM: dts: exynos4210-origen: Device tree fixes

Quoted 22 lines · Tomasz Figa

Hi Kgene,

Quoted 18 lines · On Monday 19 of November 2012 15:46:32 Tomasz Figa wrote:

This patch series fixes device tree support for Origen board:
- memory is defined using sections of maximum allowed size
- any pin configuration is modified to use pinctrl
- invalid properties in sdhci nodes are replaced according to current mmc bindings
- a fixed vmmc voltage regulator is added

Tested on Origen board.

Depends on:
[PATCH v2 0/2] mmc: host: sdhci-s3c: Add support for pinctrl interface

Tomasz Figa (4):
ARM: dts: exynos4210-origen: Split memory sections
ARM: dts: exynos4210-origen: Update for pinctrl-samsung driver
ARM: dts: exynos4210-origen: Update sdhci nodes for current bindings
ARM: dts: exynos4210-origen: Add vmmc fixed voltage regulator

Quoted 6 lines
Quoted 3 lines
 arch/arm/boot/dts/exynos4210-origen.dts | 54

++++++++++++++++----------------- 1 file changed, 27 insertions(+), 27 deletions(-)

Could you still pick these patches up for 3.8?

Looks OK to me, I want to test 1st patch on origen board with current my u-boot though.

Will apply, thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.