Skip to content

L
linux
Commit d8293670 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Geert Uytterhoeven
Browse files
Options

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

Fix the device node names as "mmc@".

Fixes: 66474697 ("ARM: dts: r7s72100: add sdhi to device tree")
Fixes: a49f76cd ("ARM: dts: r7s9210: Add SDHI support")
Fixes: 43304a5f ("ARM: shmobile: r8a73a4: tidyup DT node naming")
Fixes: 7d907894 ("ARM: shmobile: r8a7740: tidyup DT node naming")
Fixes: 3ab2ea5f ("ARM: dts: r8a7742: Add SDHI nodes")
Fixes: 63ce8a61 ("ARM: dts: r8a7743: Add SDHI controllers")
Fixes: b591e323 ("ARM: dts: r8a7744: Add SDHI nodes")
Fixes: d83010f8 ("ARM: dts: r8a7744: Initial SoC device tree")
Fixes: 7079131e ("ARM: dts: r8a7745: Add SDHI controllers")
Fixes: 0485da78 ("ARM: dts: r8a77470: Add SDHI1 support")
Fixes: 15aa5a95 ("ARM: dts: r8a77470: Add SDHI0 support")
Fixes: f068cc81 ("ARM: dts: r8a77470: Add SDHI2 support")
Fixes: 14e1d914 ("ARM: shmobile: r8a7778: tidyup DT node naming")
Fixes: 2624705c ("ARM: shmobile: r8a7779: tidyup DT node naming")
Fixes: b718aa44 ("ARM: shmobile: r8a7790: tidyup DT node naming")
Fixes: b7ed8a0d ("ARM: shmobile: Add SDHI devices to r8a7791 DTSI")
Fixes: ce01b14e ("ARM: dts: r8a7792: add SDHI support")
Fixes: fc9ee228 ("ARM: dts: r8a7793: Add SDHI controllers")
Fixes: b8e8ea12 ("ARM: shmobile: r8a7794: add SDHI DT support")
Fixes: 33f6be3b ("ARM: shmobile: sh73a0: tidyup DT node naming")
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/1594382936-14114-1-git-send-email-yoshihiro.shimoda.uh@renesas.comSigned-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent a6cb262a
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 50 deletions
arch/arm/boot/dts/r7s72100.dtsi
View file @ d8293670
......@@ -323,7 +323,7 @@ mmcif: mmc@e804c800 {
status = "disabled";
};
sdhi0: sd@e804e000 {
sdhi0: mmc@e804e000 {
compatible = "renesas,sdhi-r7s72100";
reg = <0xe804e000 0x100>;
interrupts = <GIC_SPI 270 IRQ_TYPE_LEVEL_HIGH>,
......@@ -339,7 +339,7 @@ sdhi0: sd@e804e000 {
status = "disabled";
};
sdhi1: sd@e804e800 {
sdhi1: mmc@e804e800 {
compatible = "renesas,sdhi-r7s72100";
reg = <0xe804e800 0x100>;
interrupts = <GIC_SPI 273 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm/boot/dts/r7s9210.dtsi
View file @ d8293670
......@@ -416,7 +416,7 @@ usbhs1: usb@e821b000 {
status = "disabled";
};
sdhi0: sd@e8228000 {
sdhi0: mmc@e8228000 {
compatible = "renesas,sdhi-r7s9210";
reg = <0xe8228000 0x8c0>;
interrupts = <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>;
......@@ -428,7 +428,7 @@ sdhi0: sd@e8228000 {
status = "disabled";
};
sdhi1: sd@e822a000 {
sdhi1: mmc@e822a000 {
compatible = "renesas,sdhi-r7s9210";
reg = <0xe822a000 0x8c0>;
interrupts = <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/r8a73a4.dtsi
View file @ d8293670
......@@ -409,7 +409,7 @@ scifb3: serial@e6cf0000 {
status = "disabled";
};
sdhi0: sd@ee100000 {
sdhi0: mmc@ee100000 {
compatible = "renesas,sdhi-r8a73a4";
reg = <0 0xee100000 0 0x100>;
interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
......@@ -419,7 +419,7 @@ sdhi0: sd@ee100000 {
status = "disabled";
};
sdhi1: sd@ee120000 {
sdhi1: mmc@ee120000 {
compatible = "renesas,sdhi-r8a73a4";
reg = <0 0xee120000 0 0x100>;
interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
......@@ -429,7 +429,7 @@ sdhi1: sd@ee120000 {
status = "disabled";
};
sdhi2: sd@ee140000 {
sdhi2: mmc@ee140000 {
compatible = "renesas,sdhi-r8a73a4";
reg = <0 0xee140000 0 0x100>;
interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/r8a7740.dtsi
View file @ d8293670
......@@ -349,7 +349,7 @@ mmcif0: mmc@e6bd0000 {
status = "disabled";
};
sdhi0: sd@e6850000 {
sdhi0: mmc@e6850000 {
compatible = "renesas,sdhi-r8a7740";
reg = <0xe6850000 0x100>;
interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
......@@ -362,7 +362,7 @@ sdhi0: sd@e6850000 {
status = "disabled";
};
sdhi1: sd@e6860000 {
sdhi1: mmc@e6860000 {
compatible = "renesas,sdhi-r8a7740";
reg = <0xe6860000 0x100>;
interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
......@@ -375,7 +375,7 @@ sdhi1: sd@e6860000 {
status = "disabled";
};
sdhi2: sd@e6870000 {
sdhi2: mmc@e6870000 {
compatible = "renesas,sdhi-r8a7740";
reg = <0xe6870000 0x100>;
interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm/boot/dts/r8a7742.dtsi
View file @ d8293670
......@@ -1286,7 +1286,7 @@ usb@2,0 {
};
};
sdhi0: sd@ee100000 {
sdhi0: mmc@ee100000 {
compatible = "renesas,sdhi-r8a7742",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee100000 0 0x328>;
......@@ -1301,7 +1301,7 @@ sdhi0: sd@ee100000 {
status = "disabled";
};
sdhi1: sd@ee120000 {
sdhi1: mmc@ee120000 {
compatible = "renesas,sdhi-r8a7742",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee120000 0 0x328>;
......@@ -1316,7 +1316,7 @@ sdhi1: sd@ee120000 {
status = "disabled";
};
sdhi2: sd@ee140000 {
sdhi2: mmc@ee140000 {
compatible = "renesas,sdhi-r8a7742",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee140000 0 0x100>;
......@@ -1331,7 +1331,7 @@ sdhi2: sd@ee140000 {
status = "disabled";
};
sdhi3: sd@ee160000 {
sdhi3: mmc@ee160000 {
compatible = "renesas,sdhi-r8a7742",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee160000 0 0x100>;
......
arch/arm/boot/dts/r8a7743.dtsi
View file @ d8293670
......@@ -1520,7 +1520,7 @@ usb@2,0 {
};
};
sdhi0: sd@ee100000 {
sdhi0: mmc@ee100000 {
compatible = "renesas,sdhi-r8a7743",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee100000 0 0x328>;
......@@ -1535,7 +1535,7 @@ sdhi0: sd@ee100000 {
status = "disabled";
};
sdhi1: sd@ee140000 {
sdhi1: mmc@ee140000 {
compatible = "renesas,sdhi-r8a7743",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee140000 0 0x100>;
......@@ -1550,7 +1550,7 @@ sdhi1: sd@ee140000 {
status = "disabled";
};
sdhi2: sd@ee160000 {
sdhi2: mmc@ee160000 {
compatible = "renesas,sdhi-r8a7743",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee160000 0 0x100>;
......
arch/arm/boot/dts/r8a7744.dtsi
View file @ d8293670
......@@ -1520,7 +1520,7 @@ usb@2,0 {
};
};
sdhi0: sd@ee100000 {
sdhi0: mmc@ee100000 {
compatible = "renesas,sdhi-r8a7744",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee100000 0 0x328>;
......@@ -1535,7 +1535,7 @@ sdhi0: sd@ee100000 {
status = "disabled";
};
sdhi1: sd@ee140000 {
sdhi1: mmc@ee140000 {
compatible = "renesas,sdhi-r8a7744",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee140000 0 0x100>;
......@@ -1550,7 +1550,7 @@ sdhi1: sd@ee140000 {
status = "disabled";
};
sdhi2: sd@ee160000 {
sdhi2: mmc@ee160000 {
compatible = "renesas,sdhi-r8a7744",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee160000 0 0x100>;
......
arch/arm/boot/dts/r8a7745.dtsi
View file @ d8293670
......@@ -1396,7 +1396,7 @@ usb@2,0 {
};
};
sdhi0: sd@ee100000 {
sdhi0: mmc@ee100000 {
compatible = "renesas,sdhi-r8a7745",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee100000 0 0x328>;
......@@ -1411,7 +1411,7 @@ sdhi0: sd@ee100000 {
status = "disabled";
};
sdhi1: sd@ee140000 {
sdhi1: mmc@ee140000 {
compatible = "renesas,sdhi-r8a7745",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee140000 0 0x100>;
......@@ -1426,7 +1426,7 @@ sdhi1: sd@ee140000 {
status = "disabled";
};
sdhi2: sd@ee160000 {
sdhi2: mmc@ee160000 {
compatible = "renesas,sdhi-r8a7745",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee160000 0 0x100>;
......
arch/arm/boot/dts/r8a77470.dtsi
View file @ d8293670
......@@ -882,7 +882,7 @@ usb2_phy1: usb-phy@ee0c0200 {
status = "disabled";
};
sdhi0: sd@ee100000 {
sdhi0: mmc@ee100000 {
compatible = "renesas,sdhi-r8a77470",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee100000 0 0x328>;
......@@ -897,7 +897,7 @@ sdhi0: sd@ee100000 {
status = "disabled";
};
sdhi1: sd@ee300000 {
sdhi1: mmc@ee300000 {
compatible = "renesas,sdhi-mmc-r8a77470";
reg = <0 0xee300000 0 0x2000>;
interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
......@@ -908,7 +908,7 @@ sdhi1: sd@ee300000 {
status = "disabled";
};
sdhi2: sd@ee160000 {
sdhi2: mmc@ee160000 {
compatible = "renesas,sdhi-r8a77470",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee160000 0 0x328>;
......
arch/arm/boot/dts/r8a7778.dtsi
View file @ d8293670
......@@ -401,7 +401,7 @@ mmcif: mmc@ffe4e000 {
status = "disabled";
};
sdhi0: sd@ffe4c000 {
sdhi0: mmc@ffe4c000 {
compatible = "renesas,sdhi-r8a7778",
"renesas,rcar-gen1-sdhi";
reg = <0xffe4c000 0x100>;
......@@ -411,7 +411,7 @@ sdhi0: sd@ffe4c000 {
status = "disabled";
};
sdhi1: sd@ffe4d000 {
sdhi1: mmc@ffe4d000 {
compatible = "renesas,sdhi-r8a7778",
"renesas,rcar-gen1-sdhi";
reg = <0xffe4d000 0x100>;
......@@ -421,7 +421,7 @@ sdhi1: sd@ffe4d000 {
status = "disabled";
};
sdhi2: sd@ffe4f000 {
sdhi2: mmc@ffe4f000 {
compatible = "renesas,sdhi-r8a7778",
"renesas,rcar-gen1-sdhi";
reg = <0xffe4f000 0x100>;
......
arch/arm/boot/dts/r8a7779.dtsi
View file @ d8293670
......@@ -385,7 +385,7 @@ sata: sata@fc600000 {
status = "disabled";
};
sdhi0: sd@ffe4c000 {
sdhi0: mmc@ffe4c000 {
compatible = "renesas,sdhi-r8a7779",
"renesas,rcar-gen1-sdhi";
reg = <0xffe4c000 0x100>;
......@@ -395,7 +395,7 @@ sdhi0: sd@ffe4c000 {
status = "disabled";
};
sdhi1: sd@ffe4d000 {
sdhi1: mmc@ffe4d000 {
compatible = "renesas,sdhi-r8a7779",
"renesas,rcar-gen1-sdhi";
reg = <0xffe4d000 0x100>;
......@@ -405,7 +405,7 @@ sdhi1: sd@ffe4d000 {
status = "disabled";
};
sdhi2: sd@ffe4e000 {
sdhi2: mmc@ffe4e000 {
compatible = "renesas,sdhi-r8a7779",
"renesas,rcar-gen1-sdhi";
reg = <0xffe4e000 0x100>;
......@@ -415,7 +415,7 @@ sdhi2: sd@ffe4e000 {
status = "disabled";
};
sdhi3: sd@ffe4f000 {
sdhi3: mmc@ffe4f000 {
compatible = "renesas,sdhi-r8a7779",
"renesas,rcar-gen1-sdhi";
reg = <0xffe4f000 0x100>;
......
arch/arm/boot/dts/r8a7790.dtsi
View file @ d8293670
......@@ -1467,7 +1467,7 @@ usb@2,0 {
};
};
sdhi0: sd@ee100000 {
sdhi0: mmc@ee100000 {
compatible = "renesas,sdhi-r8a7790",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee100000 0 0x328>;
......@@ -1482,7 +1482,7 @@ sdhi0: sd@ee100000 {
status = "disabled";
};
sdhi1: sd@ee120000 {
sdhi1: mmc@ee120000 {
compatible = "renesas,sdhi-r8a7790",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee120000 0 0x328>;
......@@ -1497,7 +1497,7 @@ sdhi1: sd@ee120000 {
status = "disabled";
};
sdhi2: sd@ee140000 {
sdhi2: mmc@ee140000 {
compatible = "renesas,sdhi-r8a7790",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee140000 0 0x100>;
......@@ -1512,7 +1512,7 @@ sdhi2: sd@ee140000 {
status = "disabled";
};
sdhi3: sd@ee160000 {
sdhi3: mmc@ee160000 {
compatible = "renesas,sdhi-r8a7790",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee160000 0 0x100>;
......
arch/arm/boot/dts/r8a7791.dtsi
View file @ d8293670
......@@ -1563,7 +1563,7 @@ usb@2,0 {
};
};
sdhi0: sd@ee100000 {
sdhi0: mmc@ee100000 {
compatible = "renesas,sdhi-r8a7791",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee100000 0 0x328>;
......@@ -1578,7 +1578,7 @@ sdhi0: sd@ee100000 {
status = "disabled";
};
sdhi1: sd@ee140000 {
sdhi1: mmc@ee140000 {
compatible = "renesas,sdhi-r8a7791",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee140000 0 0x100>;
......@@ -1593,7 +1593,7 @@ sdhi1: sd@ee140000 {
status = "disabled";
};
sdhi2: sd@ee160000 {
sdhi2: mmc@ee160000 {
compatible = "renesas,sdhi-r8a7791",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee160000 0 0x100>;
......
arch/arm/boot/dts/r8a7792.dtsi
View file @ d8293670
......@@ -780,7 +780,7 @@ vin5: video@e6ef5000 {
status = "disabled";
};
sdhi0: sd@ee100000 {
sdhi0: mmc@ee100000 {
compatible = "renesas,sdhi-r8a7792",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee100000 0 0x328>;
......
arch/arm/boot/dts/r8a7793.dtsi
View file @ d8293670
......@@ -1227,7 +1227,7 @@ audma1: dma-controller@ec720000 {
dma-channels = <13>;
};
sdhi0: sd@ee100000 {
sdhi0: mmc@ee100000 {
compatible = "renesas,sdhi-r8a7793",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee100000 0 0x328>;
......@@ -1242,7 +1242,7 @@ sdhi0: sd@ee100000 {
status = "disabled";
};
sdhi1: sd@ee140000 {
sdhi1: mmc@ee140000 {
compatible = "renesas,sdhi-r8a7793",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee140000 0 0x100>;
......@@ -1257,7 +1257,7 @@ sdhi1: sd@ee140000 {
status = "disabled";
};
sdhi2: sd@ee160000 {
sdhi2: mmc@ee160000 {
compatible = "renesas,sdhi-r8a7793",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee160000 0 0x100>;
......
arch/arm/boot/dts/r8a7794.dtsi
View file @ d8293670
......@@ -1232,7 +1232,7 @@ usb@2,0 {
};
};
sdhi0: sd@ee100000 {
sdhi0: mmc@ee100000 {
compatible = "renesas,sdhi-r8a7794",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee100000 0 0x328>;
......@@ -1247,7 +1247,7 @@ sdhi0: sd@ee100000 {
status = "disabled";
};
sdhi1: sd@ee140000 {
sdhi1: mmc@ee140000 {
compatible = "renesas,sdhi-r8a7794",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee140000 0 0x100>;
......@@ -1262,7 +1262,7 @@ sdhi1: sd@ee140000 {
status = "disabled";
};
sdhi2: sd@ee160000 {
sdhi2: mmc@ee160000 {
compatible = "renesas,sdhi-r8a7794",
"renesas,rcar-gen2-sdhi";
reg = <0 0xee160000 0 0x100>;
......
arch/arm/boot/dts/sh73a0.dtsi
View file @ d8293670
......@@ -321,7 +321,7 @@ msiof3: spi@e6c90000 {
status = "disabled";
};
sdhi0: sd@ee100000 {
sdhi0: mmc@ee100000 {
compatible = "renesas,sdhi-sh73a0";
reg = <0xee100000 0x100>;
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>,
......@@ -334,7 +334,7 @@ sdhi0: sd@ee100000 {
};
/* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */
sdhi1: sd@ee120000 {
sdhi1: mmc@ee120000 {
compatible = "renesas,sdhi-sh73a0";
reg = <0xee120000 0x100>;
interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>,
......@@ -346,7 +346,7 @@ sdhi1: sd@ee120000 {
status = "disabled";
};
sdhi2: sd@ee140000 {
sdhi2: mmc@ee140000 {
compatible = "renesas,sdhi-sh73a0";
reg = <0xee140000 0x100>;
interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7