[U-Boot] [PATCH 4/5] arm: dts: exynos4: change to use their parent node
Jaehoon Chung
jh80.chung at samsung.com
Mon Oct 24 08:08:56 CEST 2016
Didn't overwrite the node. Just reuse the parent node.
And add the Exynos Series specific properties.
Signed-off-by: Jaehoon Chung <jh80.chung at 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 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";
};
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 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";
};
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 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";
+};
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 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";
- };
-
- dwmmc at 12550000 {
- samsung,bus-width = <8>;
- samsung,timing = <2 1 0>;
- samsung,removable = <0>;
- fifoth_val = <0x203f0040>;
- bus_hz = <400000000>;
- div = <0x3>;
- index = <4>;
- };
-
ehci at 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 at 138d0000";
serial0 = "/serial at 13800000";
console = "/serial at 13820000";
- mmc0 = "/sdhci at 12510000";
- mmc2 = "/sdhci at 12530000";
- mshc0 = "/dwmmc at 12550000";
};
i2c at 138d0000 {
@@ -412,35 +409,30 @@
samsung,dsim-device-reverse-panel = <1>;
};
+};
- sdhci at 12510000 {
- samsung,bus-width = <8>;
- samsung,timing = <1 3 3>;
- pwr-gpios = <&gpk0 4 0>;
- status = "disabled";
- };
-
- sdhci at 12520000 {
- status = "disabled";
- };
-
- sdhci at 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 at 12540000 {
- status = "disabled";
- };
+&sdhci2 {
+ samsung,bus-width = <4>;
+ samsung,timing = <1 2 3>;
+ cd-gpios = <&gpk2 2 0>;
+ status = "okay";
+};
- dwmmc at 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";
};
--
2.10.1
More information about the U-Boot
mailing list