ARM: dts: exynos4: change the nodes relevant to mmc/sd

Change the nodes relevant to mmc/sd for using DM.
compatible are also changed to each SoCs.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/arch/arm/dts/exynos4.dtsi b/arch/arm/dts/exynos4.dtsi
index a5a00c8fd421f6f17e44bf125474074cda0878a4..53d39dcb0ca2ed30d6d73bbe61613e5059260b37 100644 (file)
--- a/arch/arm/dts/exynos4.dtsi
+++ b/arch/arm/dts/exynos4.dtsi
@@ -122,44 +122,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";
        };
 
 };

diff --git a/arch/arm/dts/exynos4210-origen.dts b/arch/arm/dts/exynos4210-origen.dts
index 26c4d7f4c646f7c65196640b72e5701ecbb64931..a13d033ca9832d45a7828ab081e88842e2354936 100644 (file)
--- 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 ac422e4fc405431d486a6df45a0fa4c37c6d949e..2abe3e99ae2cc7948fecad312665664a6c5ba3cc 100644 (file)
--- a/arch/arm/dts/exynos4210-trats.dts
+++ b/arch/arm/dts/exynos4210-trats.dts
@@ -21,8 +21,6 @@
        aliases {
                serial0 = "/serial@13800000";
                console = "/serial@13820000";
-               mmc0 = "/sdhci@12510000";
-               mmc2 = "/sdhci@12530000";
                i2c8 = &i2c_fg;
        };
 
@@ -91,30 +89,6 @@
                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";
-       };
-
        i2c_fg: fuel-gauge {
                compatible = "i2c-gpio";
                gpios = <&gpy4 1 0>,    /* sda */
@@ -265,3 +239,17 @@
                };
        };
 };
+
+&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 57636276a8321a753f04c54745d39ddbfb6340e1..d8ce0e33c83e1ae6312d2f55ed6ccd93460a9fc4 100644 (file)
--- 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 {
@@ -258,3 +236,17 @@
                };
        };
 };
+
+&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 8710747e38e42d579a4f31b0b8c99b1dda70a4e2..ecfd5d1e8b7a81051f3ed7657412373e4d5dd1cf 100644 (file)
--- a/arch/arm/dts/exynos4412-odroid.dts
+++ b/arch/arm/dts/exynos4412-odroid.dts
@@ -25,8 +25,8 @@
                i2c7 = "/i2c@138d0000";
                serial0 = "/serial@13800000";
                console = "/serial@13810000";
-               mmc2 = "/sdhci@12530000";
-               mmc4 = "/dwmmc@12550000";
+               mmc0 = &mshc_0;
+               mmc1 = &sdhci2;
        };
 
        i2c@13860000 {
@@ -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 fd9e48c899c3f20c4324f6c411b7eb6bc397c56a..0938e7941a7b9fa4ac4d4f720eac8808f03198f2 100644 (file)
--- a/arch/arm/dts/exynos4412-trats2.dts
+++ b/arch/arm/dts/exynos4412-trats2.dts
@@ -31,9 +31,8 @@
                i2c9 = &i2c_max77693;
                serial0 = "/serial@13800000";
                console = "/serial@13820000";
-               mmc0 = "/sdhci@12510000";
-               mmc2 = "/sdhci@12530000";
-               mshc0 = "/dwmmc@12550000";
+               mmc0 = &mshc_0;
+               mmc1 = &sdhci2;
        };
 
        i2c_fg: fuel-gauge {
@@ -437,28 +436,30 @@
                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";
 };

diff --git a/arch/arm/dts/exynos4x12.dtsi b/arch/arm/dts/exynos4x12.dtsi
index 5d58c6eedcf86a69fcd139bd7cacace0b0136ef2..b977288a74d38dbf0fc88d0b0b33759cd59203bf 100644 (file)
--- 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 77 0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               fifo-depth = <0x80>;
-               clocks = <&clock 301>, <&clock 149>;
-               clock-names = "biu", "ciu";
-               status = "disabled";
-       };
 };