Commit 2c2a5564 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-dt-for-v5.9-tag2' of... 

Merge tag 'renesas-arm-dt-for-v5.9-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt

Renesas ARM DT updates for v5.9 (take two)

  - SPI Multi I/O Bus Controller (RPC-IF) support for R-Car V3H and V3M,
    including QSPI support for the Condor, Eagle, V3HSK, and V3MSK
    boards,
  - Initial support for the RZ/G2H SoC on the HopeRun HiHope RZ/G2H
    board,
  - Initial support for the Beacon EmbeddedWorks RZ/G2M board,
  - Minor fixes and improvements.

* tag 'renesas-arm-dt-for-v5.9-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: (34 commits)
  ARM: dts: sh73a0: Add missing clocks to sound node
  arm64: dts: renesas: r8a774e1: Add CAN[FD] support
  arm64: dts: renesas: r8a774e1: Add RWDT node
  arm64: dts: renesas: r8a774e1: Add MSIOF nodes
  arm64: dts: renesas: r8a774e1: Add I2C and IIC-DVFS support
  arm64: dts: renesas: r8a774e1: Add SDHI nodes
  arm64: dts: renesas: r8a774e1: Add SCIF and HSCIF nodes
  arm64: dts: renesas: r8a774e1: Add TMU device nodes
  arm64: dts: renesas: r8a774e1: Add CMT device nodes
  arm64: dts: renesas: r8a774e1: Add RZ/G2H thermal support
  arm64: dts: renesas: r8a774e1: Add operating points
  arm64: dts: renesas: Introduce r8a774a1-beacon-rzg2m-kit
  arm64: dts: renesas: r8a774e1: Add Ethernet AVB node
  arm64: dts: renesas: r8a774e1: Add GPIO device nodes
  arm64: dts: renesas: r8a774e1: Add SYS-DMAC device nodes
  arm64: dts: renesas: r8a774e1: Add IPMMU device nodes
  ARM: dts: gose: Fix ports node name for adv7612
  ARM: dts: renesas: Fix SD Card/eMMC interface device node names
  arm64: dts: renesas: Fix SD Card/eMMC interface device node names
  arm64: dts: renesas: add full-pwr-cycle-in-suspend into eMMC nodes
  ...

Link: https://lore.kernel.org/r/20200717112427.26032-2-geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 39a85f6d 8aa937cb

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>;