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

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.com


Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent a6cb262a

arch/arm/boot/dts/r7s72100.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+3 −3
Original line number Diff line number Diff line
@@ -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

+3 −3
Original line number Diff line number Diff line
@@ -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

+4 −4
Original line number Diff line number Diff line
@@ -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>;