ARM: dts: imx: Change esdhc node name on i.MX2/i.MX3/i.MX5 SoCs

Change i.MX2/i.MX3/i.MX5 SoCs esdhc node name from esdhc to mmc to
be compliant with yaml schema, it requires the nodename to be "mmc".

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 4eaf4eb..b045c6d 100644 (file)
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -453,7 +453,7 @@
                                interrupts = <22>;
                        };
 
-                       esdhc1: esdhc@53fb4000 {
+                       esdhc1: mmc@53fb4000 {
                                compatible = "fsl,imx25-esdhc";
                                reg = <0x53fb4000 0x4000>;
                                interrupts = <9>;
@@ -462,7 +462,7 @@
                                status = "disabled";
                        };
 
-                       esdhc2: esdhc@53fb8000 {
+                       esdhc2: mmc@53fb8000 {
                                compatible = "fsl,imx25-esdhc";
                                reg = <0x53fb8000 0x4000>;
                                interrupts = <8>;

diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index 502112b..e154087 100644 (file)
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -231,7 +231,7 @@
                                #interrupt-cells = <2>;
                        };
 
-                       esdhc1: esdhc@53fb4000 {
+                       esdhc1: mmc@53fb4000 {
                                compatible = "fsl,imx35-esdhc";
                                reg = <0x53fb4000 0x4000>;
                                interrupts = <7>;
@@ -240,7 +240,7 @@
                                status = "disabled";
                        };
 
-                       esdhc2: esdhc@53fb8000 {
+                       esdhc2: mmc@53fb8000 {
                                compatible = "fsl,imx35-esdhc";
                                reg = <0x53fb8000 0x4000>;
                                interrupts = <8>;
@@ -249,7 +249,7 @@
                                status = "disabled";
                        };
 
-                       esdhc3: esdhc@53fbc000 {
+                       esdhc3: mmc@53fbc000 {
                                compatible = "fsl,imx35-esdhc";
                                reg = <0x53fbc000 0x4000>;
                                interrupts = <9>;

diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index 1f4ecbc..377951a 100644 (file)
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -115,7 +115,7 @@
                                reg = <0x50000000 0x40000>;
                                ranges;
 
-                               esdhc1: esdhc@50004000 {
+                               esdhc1: mmc@50004000 {
                                        compatible = "fsl,imx50-esdhc", "fsl,imx53-esdhc";
                                        reg = <0x50004000 0x4000>;
                                        interrupts = <1>;
@@ -127,7 +127,7 @@
                                        status = "disabled";
                                };
 
-                               esdhc2: esdhc@50008000 {
+                               esdhc2: mmc@50008000 {
                                        compatible = "fsl,imx50-esdhc", "fsl,imx53-esdhc";
                                        reg = <0x50008000 0x4000>;
                                        interrupts = <2>;
@@ -176,7 +176,7 @@
                                        status = "disabled";
                                };
 
-                               esdhc3: esdhc@50020000 {
+                               esdhc3: mmc@50020000 {
                                        compatible = "fsl,imx50-esdhc", "fsl,imx53-esdhc";
                                        reg = <0x50020000 0x4000>;
                                        interrupts = <3>;
@@ -188,7 +188,7 @@
                                        status = "disabled";
                                };
 
-                               esdhc4: esdhc@50024000 {
+                               esdhc4: mmc@50024000 {
                                        compatible = "fsl,imx50-esdhc", "fsl,imx53-esdhc";
                                        reg = <0x50024000 0x4000>;
                                        interrupts = <4>;

diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index c83bc77..db5827d 100644 (file)
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -185,7 +185,7 @@
                                reg = <0x70000000 0x40000>;
                                ranges;
 
-                               esdhc1: esdhc@70004000 {
+                               esdhc1: mmc@70004000 {
                                        compatible = "fsl,imx51-esdhc";
                                        reg = <0x70004000 0x4000>;
                                        interrupts = <1>;
@@ -196,7 +196,7 @@
                                        status = "disabled";
                                };
 
-                               esdhc2: esdhc@70008000 {
+                               esdhc2: mmc@70008000 {
                                        compatible = "fsl,imx51-esdhc";
                                        reg = <0x70008000 0x4000>;
                                        interrupts = <2>;
@@ -245,7 +245,7 @@
                                        status = "disabled";
                                };
 
-                               esdhc3: esdhc@70020000 {
+                               esdhc3: mmc@70020000 {
                                        compatible = "fsl,imx51-esdhc";
                                        reg = <0x70020000 0x4000>;
                                        interrupts = <3>;
@@ -257,7 +257,7 @@
                                        status = "disabled";
                                };
 
-                               esdhc4: esdhc@70024000 {
+                               esdhc4: mmc@70024000 {
                                        compatible = "fsl,imx51-esdhc";
                                        reg = <0x70024000 0x4000>;
                                        interrupts = <4>;

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index ed6b0c8..9a4fc99 100644 (file)
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -236,7 +236,7 @@
                                reg = <0x50000000 0x40000>;
                                ranges;
 
-                               esdhc1: esdhc@50004000 {
+                               esdhc1: mmc@50004000 {
                                        compatible = "fsl,imx53-esdhc";
                                        reg = <0x50004000 0x4000>;
                                        interrupts = <1>;
@@ -248,7 +248,7 @@
                                        status = "disabled";
                                };
 
-                               esdhc2: esdhc@50008000 {
+                               esdhc2: mmc@50008000 {
                                        compatible = "fsl,imx53-esdhc";
                                        reg = <0x50008000 0x4000>;
                                        interrupts = <2>;
@@ -301,7 +301,7 @@
                                        status = "disabled";
                                };
 
-                               esdhc3: esdhc@50020000 {
+                               esdhc3: mmc@50020000 {
                                        compatible = "fsl,imx53-esdhc";
                                        reg = <0x50020000 0x4000>;
                                        interrupts = <3>;
@@ -313,7 +313,7 @@
                                        status = "disabled";
                                };
 
-                               esdhc4: esdhc@50024000 {
+                               esdhc4: mmc@50024000 {
                                        compatible = "fsl,imx53-esdhc";
                                        reg = <0x50024000 0x4000>;
                                        interrupts = <4>;