arm64: dts: renesas: Fix SD Card/eMMC interface device node names

Fix the device node names as "mmc@".

Fixes: 663386c3e1aa ("arm64: dts: renesas: r8a774a1: Add SDHI nodes")
Fixes: 9b33e3001b67 ("arm64: dts: renesas: Initial r8a774b1 SoC device tree")
Fixes: 77223211f44d ("arm64: dts: renesas: r8a774c0: Add SDHI nodes")
Fixes: d9d67010e0c6 ("arm64: dts: r8a7795: Add SDHI support to dtsi")
Fixes: a513cf1e6457 ("arm64: dts: r8a7796: add SDHI nodes")
Fixes: 111cc9ace2b5 ("arm64: dts: renesas: r8a77961: Add SDHI nodes")
Fixes: f51746ad7d1f ("arm64: dts: renesas: Add Renesas R8A77961 SoC support")
Fixes: df863d6f95f5 ("arm64: dts: renesas: initial R8A77965 SoC device tree")
Fixes: 9aa3558a02f0 ("arm64: dts: renesas: ebisu: Add and enable SDHI device nodes")
Fixes: 83f18749c2f6 ("arm64: dts: renesas: r8a77995: Add SDHI (MMC) support")
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/1594382634-13714-1-git-send-email-yoshihiro.shimoda.uh@renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
index 51a572898fd68a7df0510249aaf315f1b37a1b56..8e80f50132ad55f54b77b01f65214cc0c7c455ba 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
@@ -2252,7 +2252,7 @@ usb2_phy1: usb-phy@ee0a0200 {
                        status = "disabled";
                };
 
-               sdhi0: sd@ee100000 {
+               sdhi0: mmc@ee100000 {
                        compatible = "renesas,sdhi-r8a774a1",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee100000 0 0x2000>;
@@ -2264,7 +2264,7 @@ sdhi0: sd@ee100000 {
                        status = "disabled";
                };
 
-               sdhi1: sd@ee120000 {
+               sdhi1: mmc@ee120000 {
                        compatible = "renesas,sdhi-r8a774a1",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee120000 0 0x2000>;
@@ -2276,7 +2276,7 @@ sdhi1: sd@ee120000 {
                        status = "disabled";
                };
 
-               sdhi2: sd@ee140000 {
+               sdhi2: mmc@ee140000 {
                        compatible = "renesas,sdhi-r8a774a1",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee140000 0 0x2000>;
@@ -2288,7 +2288,7 @@ sdhi2: sd@ee140000 {
                        status = "disabled";
                };
 
-               sdhi3: sd@ee160000 {
+               sdhi3: mmc@ee160000 {
                        compatible = "renesas,sdhi-r8a774a1",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee160000 0 0x2000>;

diff --git a/arch/arm64/boot/dts/renesas/r8a774b1.dtsi b/arch/arm64/boot/dts/renesas/r8a774b1.dtsi
index b221f2575e6328f9997d4c3f204f91b9e047b397..49e5addcfd97af01ead54a4207f8052e7c216aff 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a774b1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774b1.dtsi
@@ -2110,7 +2110,7 @@ usb2_phy1: usb-phy@ee0a0200 {
                        status = "disabled";
                };
 
-               sdhi0: sd@ee100000 {
+               sdhi0: mmc@ee100000 {
                        compatible = "renesas,sdhi-r8a774b1",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee100000 0 0x2000>;
@@ -2122,7 +2122,7 @@ sdhi0: sd@ee100000 {
                        status = "disabled";
                };
 
-               sdhi1: sd@ee120000 {
+               sdhi1: mmc@ee120000 {
                        compatible = "renesas,sdhi-r8a774b1",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee120000 0 0x2000>;
@@ -2134,7 +2134,7 @@ sdhi1: sd@ee120000 {
                        status = "disabled";
                };
 
-               sdhi2: sd@ee140000 {
+               sdhi2: mmc@ee140000 {
                        compatible = "renesas,sdhi-r8a774b1",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee140000 0 0x2000>;
@@ -2146,7 +2146,7 @@ sdhi2: sd@ee140000 {
                        status = "disabled";
                };
 
-               sdhi3: sd@ee160000 {
+               sdhi3: mmc@ee160000 {
                        compatible = "renesas,sdhi-r8a774b1",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee160000 0 0x2000>;

diff --git a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
index 5c72a7efbb035d02835bf6ba887fc010dffd5e5a..42171190cce4602d0a7e4e69587a5f726edd8036 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
@@ -1618,7 +1618,7 @@ usb2_phy0: usb-phy@ee080200 {
                        status = "disabled";
                };
 
-               sdhi0: sd@ee100000 {
+               sdhi0: mmc@ee100000 {
                        compatible = "renesas,sdhi-r8a774c0",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee100000 0 0x2000>;
@@ -1630,7 +1630,7 @@ sdhi0: sd@ee100000 {
                        status = "disabled";
                };
 
-               sdhi1: sd@ee120000 {
+               sdhi1: mmc@ee120000 {
                        compatible = "renesas,sdhi-r8a774c0",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee120000 0 0x2000>;
@@ -1642,7 +1642,7 @@ sdhi1: sd@ee120000 {
                        status = "disabled";
                };
 
-               sdhi3: sd@ee160000 {
+               sdhi3: mmc@ee160000 {
                        compatible = "renesas,sdhi-r8a774c0",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee160000 0 0x2000>;

diff --git a/arch/arm64/boot/dts/renesas/r8a77951.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
index 61d67d9714ab953167818507d41ff92912bae5aa..9beb8e76d9235b7111646258b400ee4a047b2349 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
@@ -2590,7 +2590,7 @@ usb2_phy3: usb-phy@ee0e0200 {
                        status = "disabled";
                };
 
-               sdhi0: sd@ee100000 {
+               sdhi0: mmc@ee100000 {
                        compatible = "renesas,sdhi-r8a7795",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee100000 0 0x2000>;
@@ -2603,7 +2603,7 @@ sdhi0: sd@ee100000 {
                        status = "disabled";
                };
 
-               sdhi1: sd@ee120000 {
+               sdhi1: mmc@ee120000 {
                        compatible = "renesas,sdhi-r8a7795",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee120000 0 0x2000>;
@@ -2616,7 +2616,7 @@ sdhi1: sd@ee120000 {
                        status = "disabled";
                };
 
-               sdhi2: sd@ee140000 {
+               sdhi2: mmc@ee140000 {
                        compatible = "renesas,sdhi-r8a7795",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee140000 0 0x2000>;
@@ -2629,7 +2629,7 @@ sdhi2: sd@ee140000 {
                        status = "disabled";
                };
 
-               sdhi3: sd@ee160000 {
+               sdhi3: mmc@ee160000 {
                        compatible = "renesas,sdhi-r8a7795",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee160000 0 0x2000>;

diff --git a/arch/arm64/boot/dts/renesas/r8a77960.dtsi b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
index 33bf62acffbb73d2a97d0edf6f0fc5a5e1948277..4dfb7f07678714e95f07f1c1fef9f399b66fb18a 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a77960.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
@@ -2394,7 +2394,7 @@ usb2_phy1: usb-phy@ee0a0200 {
                        status = "disabled";
                };
 
-               sdhi0: sd@ee100000 {
+               sdhi0: mmc@ee100000 {
                        compatible = "renesas,sdhi-r8a7796",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee100000 0 0x2000>;
@@ -2407,7 +2407,7 @@ sdhi0: sd@ee100000 {
                        status = "disabled";
                };
 
-               sdhi1: sd@ee120000 {
+               sdhi1: mmc@ee120000 {
                        compatible = "renesas,sdhi-r8a7796",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee120000 0 0x2000>;
@@ -2420,7 +2420,7 @@ sdhi1: sd@ee120000 {
                        status = "disabled";
                };
 
-               sdhi2: sd@ee140000 {
+               sdhi2: mmc@ee140000 {
                        compatible = "renesas,sdhi-r8a7796",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee140000 0 0x2000>;
@@ -2433,7 +2433,7 @@ sdhi2: sd@ee140000 {
                        status = "disabled";
                };
 
-               sdhi3: sd@ee160000 {
+               sdhi3: mmc@ee160000 {
                        compatible = "renesas,sdhi-r8a7796",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee160000 0 0x2000>;

diff --git a/arch/arm64/boot/dts/renesas/r8a77961.dtsi b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
index de5770cbf19b6d725f555209b9f1823e7bc71b50..542c44c7dbca30b6247a3df9b051adc31b504989 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a77961.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
@@ -1346,7 +1346,7 @@ usb2_phy1: usb-phy@ee0a0200 {
                        status = "disabled";
                };
 
-               sdhi0: sd@ee100000 {
+               sdhi0: mmc@ee100000 {
                        compatible = "renesas,sdhi-r8a77961",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee100000 0 0x2000>;
@@ -1358,7 +1358,7 @@ sdhi0: sd@ee100000 {
                        status = "disabled";
                };
 
-               sdhi1: sd@ee120000 {
+               sdhi1: mmc@ee120000 {
                        compatible = "renesas,sdhi-r8a77961",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee120000 0 0x2000>;
@@ -1370,7 +1370,7 @@ sdhi1: sd@ee120000 {
                        status = "disabled";
                };
 
-               sdhi2: sd@ee140000 {
+               sdhi2: mmc@ee140000 {
                        compatible = "renesas,sdhi-r8a77961",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee140000 0 0x2000>;
@@ -1382,7 +1382,7 @@ sdhi2: sd@ee140000 {
                        status = "disabled";
                };
 
-               sdhi3: sd@ee160000 {
+               sdhi3: mmc@ee160000 {
                        compatible = "renesas,sdhi-r8a77961",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee160000 0 0x2000>;

diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
index 6f7ab39fd2824b4626573955fdba68c319dda91f..fe4dc12e2bdfae6f728a3bb7f3f3fe2f10284952 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
@@ -2120,7 +2120,7 @@ usb2_phy1: usb-phy@ee0a0200 {
                        status = "disabled";
                };
 
-               sdhi0: sd@ee100000 {
+               sdhi0: mmc@ee100000 {
                        compatible = "renesas,sdhi-r8a77965",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee100000 0 0x2000>;
@@ -2133,7 +2133,7 @@ sdhi0: sd@ee100000 {
                        status = "disabled";
                };
 
-               sdhi1: sd@ee120000 {
+               sdhi1: mmc@ee120000 {
                        compatible = "renesas,sdhi-r8a77965",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee120000 0 0x2000>;
@@ -2146,7 +2146,7 @@ sdhi1: sd@ee120000 {
                        status = "disabled";
                };
 
-               sdhi2: sd@ee140000 {
+               sdhi2: mmc@ee140000 {
                        compatible = "renesas,sdhi-r8a77965",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee140000 0 0x2000>;
@@ -2159,7 +2159,7 @@ sdhi2: sd@ee140000 {
                        status = "disabled";
                };
 
-               sdhi3: sd@ee160000 {
+               sdhi3: mmc@ee160000 {
                        compatible = "renesas,sdhi-r8a77965",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee160000 0 0x2000>;

diff --git a/arch/arm64/boot/dts/renesas/r8a77990.dtsi b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
index cd11f24744d4af552d0b948b5c8228f2e5d1dd22..1991bdc36792f4e30fa4d811e1e4242c303c0dff 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a77990.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
@@ -1595,7 +1595,7 @@ usb2_phy0: usb-phy@ee080200 {
                        status = "disabled";
                };
 
-               sdhi0: sd@ee100000 {
+               sdhi0: mmc@ee100000 {
                        compatible = "renesas,sdhi-r8a77990",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee100000 0 0x2000>;
@@ -1608,7 +1608,7 @@ sdhi0: sd@ee100000 {
                        status = "disabled";
                };
 
-               sdhi1: sd@ee120000 {
+               sdhi1: mmc@ee120000 {
                        compatible = "renesas,sdhi-r8a77990",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee120000 0 0x2000>;
@@ -1621,7 +1621,7 @@ sdhi1: sd@ee120000 {
                        status = "disabled";
                };
 
-               sdhi3: sd@ee160000 {
+               sdhi3: mmc@ee160000 {
                        compatible = "renesas,sdhi-r8a77990",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee160000 0 0x2000>;

diff --git a/arch/arm64/boot/dts/renesas/r8a77995.dtsi b/arch/arm64/boot/dts/renesas/r8a77995.dtsi
index e5617ec0f49cb6def354389d9fb75beff992ae47..2c2272f5f5b521058472d48220ea0e07c36d90d9 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a77995.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77995.dtsi
@@ -916,7 +916,7 @@ usb2_phy0: usb-phy@ee080200 {
                        status = "disabled";
                };
 
-               sdhi2: sd@ee140000 {
+               sdhi2: mmc@ee140000 {
                        compatible = "renesas,sdhi-r8a77995",
                                     "renesas,rcar-gen3-sdhi";
                        reg = <0 0xee140000 0 0x2000>;