ARM: dts: Fix up MMC host node names

The standard mandates that these nodes be named
mmc@... not sdi_foo@...

Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
index 404b9c4a5feee3ebd55fc208dd76d0712c54383e..68607e4ad80cb464a1b738ad4cdce82ab6f693d2 100644 (file)
--- a/arch/arm/boot/dts/ste-dbx5x0.dtsi
+++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi
@@ -883,7 +883,7 @@
                        status = "disabled";
                };
 
-               sdi0_per1@80126000 {
+               mmc@80126000 {
                        compatible = "arm,pl18x", "arm,primecell";
                        reg = <0x80126000 0x1000>;
                        interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
@@ -899,7 +899,7 @@
                        status = "disabled";
                };
 
-               sdi1_per2@80118000 {
+               mmc@80118000 {
                        compatible = "arm,pl18x", "arm,primecell";
                        reg = <0x80118000 0x1000>;
                        interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
@@ -915,7 +915,7 @@
                        status = "disabled";
                };
 
-               sdi2_per3@80005000 {
+               mmc@80005000 {
                        compatible = "arm,pl18x", "arm,primecell";
                        reg = <0x80005000 0x1000>;
                        interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
@@ -931,7 +931,7 @@
                        status = "disabled";
                };
 
-               sdi3_per2@80119000 {
+               mmc@80119000 {
                        compatible = "arm,pl18x", "arm,primecell";
                        reg = <0x80119000 0x1000>;
                        interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
@@ -947,7 +947,7 @@
                        status = "disabled";
                };
 
-               sdi4_per2@80114000 {
+               mmc@80114000 {
                        compatible = "arm,pl18x", "arm,primecell";
                        reg = <0x80114000 0x1000>;
                        interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
@@ -963,7 +963,7 @@
                        status = "disabled";
                };
 
-               sdi5_per3@80008000 {
+               mmc@80008000 {
                        compatible = "arm,pl18x", "arm,primecell";
                        reg = <0x80008000 0x1000>;
                        interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index 8c03124b69601f4dd88a636a2c92e8a80fed65d2..83b179692dff7b4082459e544c5fb73ed2d8e9ac 100644 (file)
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -114,7 +114,7 @@
                };
 
                // External Micro SD slot
-               sdi0_per1@80126000 {
+               mmc@80126000 {
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <4>;
@@ -137,7 +137,7 @@
                };
 
                // WLAN SDIO channel
-               sdi1_per2@80118000 {
+               mmc@80118000 {
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <4>;
@@ -150,7 +150,7 @@
                };
 
                // PoP:ed eMMC
-               sdi2_per3@80005000 {
+               mmc@80005000 {
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <8>;
@@ -165,7 +165,7 @@
                };
 
                // On-board eMMC
-               sdi4_per2@80114000 {
+               mmc@80114000 {
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <8>;

diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi
index 931998dd364b5477c0464761138cebfac335a904..29b67abfc461af97f7a1e3b365e7035ba830802f 100644 (file)
--- a/arch/arm/boot/dts/ste-hrefprev60.dtsi
+++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi
@@ -61,7 +61,7 @@
                };
 
                // External Micro SD slot
-               sdi0_per1@80126000 {
+               mmc@80126000 {
                        cd-gpios  = <&tc3589x_gpio 3 GPIO_ACTIVE_HIGH>;
                };
 

diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
index 05ea12e6df1c08dc57f1cb015a24197a21a8f3c1..8f504edefd3f24e7abf9c19d34430a82489a0b5f 100644 (file)
--- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi
+++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
@@ -190,7 +190,7 @@
                };
 
                // External Micro SD slot
-               sdi0_per1@80126000 {
+               mmc@80126000 {
                        cd-gpios  = <&gpio2 31 GPIO_ACTIVE_HIGH>; // 95
                };
 

diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index be90e73c923ec255e156996f1b0990f5d37886c4..f32b07f31acf140b6cd64ed607b262ea9d24e725 100644 (file)
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -213,7 +213,7 @@
                };
 
                // External Micro SD slot
-               sdi0_per1@80126000 {
+               mmc@80126000 {
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <4>;
@@ -241,7 +241,7 @@
                };
 
                // WLAN SDIO channel
-               sdi1_per2@80118000 {
+               mmc@80118000 {
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <4>;
@@ -253,7 +253,7 @@
                };
 
                // Unused PoP eMMC - register and put it to sleep by default */
-               sdi2_per3@80005000 {
+               mmc@80005000 {
                        arm,primecell-periphid = <0x10480180>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&mc2_a_1_sleep>;
@@ -262,7 +262,7 @@
                };
 
                // On-board eMMC
-               sdi4_per2@80114000 {
+               mmc@80114000 {
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <8>;

diff --git a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
index 496f9d3ba7b7ea4bff154769bc54ab1eb98b0b70..00ee013cbd1dc1d99063ebf1be91514eb15183ab 100644 (file)
--- a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
@@ -72,7 +72,7 @@
 
        soc {
                /* External Micro SD card slot */
-               sdi0_per1@80126000 {
+               mmc@80126000 {
                        status = "okay";
 
                        arm,primecell-periphid = <0x10480180>;
@@ -100,7 +100,7 @@
                };
 
                /* WLAN SDIO */
-               sdi1_per2@80118000 {
+               mmc@80118000 {
                        status = "okay";
 
                        arm,primecell-periphid = <0x10480180>;
@@ -134,7 +134,7 @@
                };
 
                /* eMMC */
-               sdi2_per3@80005000 {
+               mmc@80005000 {
                        status = "okay";
 
                        arm,primecell-periphid = <0x10480180>;

diff --git a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
index 31ee34e79fe1ba66d7a3bf69d416b2e33b9cf37b..95d5abe5dc0d29eaf03d41f398d2cdd9e7dcffb8 100644 (file)
--- a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
@@ -329,7 +329,7 @@
 
        soc {
                /* External Micro SD slot */
-               sdi0_per1@80126000 {
+               mmc@80126000 {
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <50000000>;
                        bus-width = <4>;
@@ -352,7 +352,7 @@
                };
 
                /* WLAN SDIO channel */
-               sdi1_per2@80118000 {
+               mmc@80118000 {
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <50000000>;
                        bus-width = <4>;
@@ -390,7 +390,7 @@
                };
 
                /* eMMC */
-               sdi2_per3@80005000 {
+               mmc@80005000 {
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <50000000>;
                        bus-width = <8>;

diff --git a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
index b50634c81b4445acfd106bce5afcfe53b91c5264..36420492fd725a121050ef2c3edb822b1cf8dd71 100644 (file)
--- a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
@@ -147,7 +147,7 @@
 
        soc {
                // External Micro SD slot
-               sdi0_per1@80126000 {
+               mmc@80126000 {
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <4>;
@@ -169,7 +169,7 @@
                };
 
                // WLAN SDIO channel
-               sdi1_per2@80118000 {
+               mmc@80118000 {
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <50000000>;
                        bus-width = <4>;
@@ -196,7 +196,7 @@
                };
 
                // eMMC
-               sdi2_per3@80005000 {
+               mmc@80005000 {
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <8>;