Commit 0b69d912 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

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

  - PCIe endpoint support for the RZ/G2H SoC,
  - SATA support for the HopeRun HiHope RZ/G2H board,
  - Increase support (CAN, LED, SPI NOR, VIN, VSP) for the RZ/G1H SoC on
    the iWave Qseven board (G21D), and its camera add-on board,
  - Initial support for the R-Car V3U SoC on the Falcon CPU and BreakOut
    boards,
  - HDMI display and sound support for the R-Car M3-W+ SoC on the
    Salvator-XS board,
  - Digital Radio Interface (DRIF) support for the R-Car E3 SoC,
  - Minor fixes and cleanups.

* tag 'renesas-arm-dt-for-v5.10-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: (24 commits)
  arm64: dts: renesas: r8a774c0: Fix MSIOF1 DMA channels
  arm64: dts: renesas: r8a77990: Fix MSIOF1 DMA channels
  arm64: dts: renesas: r8a77990: Add DRIF support
  ARM: dts: r8a7742-iwg21d-q7-dbcm-ca: Add can0 support to camera DB
  ARM: dts: r8a7742: Add VSP support
  arm64: dts: renesas: Drop superfluous pin configuration containers
  arm64: dts: renesas: r8a77961: salvator-xs: Add HDMI Sound support
  arm64: dts: renesas: r8a77961: salvator-xs: Add HDMI Display support
  arm64: dts: renesas: r8a77961: Add HDMI device nodes
  arm64: dts: renesas: r8a77961: Add DU device nodes
  arm64: dts: renesas: r8a77961: Add VSP device nodes
  arm64: dts: renesas: r8a77961: Add FCP device nodes
  arm64: dts: renesas: Fix pin controller node names
  ARM: dts: renesas: Fix pin controller node names
  arm64: dts: renesas: Add Renesas Falcon boards support
  arm64: dts: renesas: Add Renesas R8A779A0 SoC support
  ARM: dts: r8a7742-iwg21d-q7: Enable SD2 LED indication
  ARM: dts: r8a7742-iwg21d-q7: Add can1 support to carrier board
  ARM: dts: r8a7742-iwg21d-q7: Add SPI NOR support
  ARM: dts: r8a7742: Add VIN DT nodes
  ...

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


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e90ac411 c91dfc98

arch/arm/boot/dts/emev2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ uart3: serial@e1050000 { 
		clock-names = "sclk";

	};



	pfc: pin-controller@e0140200 {

	pfc: pinctrl@e0140200 {

		compatible = "renesas,pfc-emev2";

		reg = <0xe0140200 0x100>;

	};

arch/arm/boot/dts/r7s72100.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ R7S72100_CLK_SDHI10 R7S72100_CLK_SDHI11 
			clock-output-names = "sdhi00", "sdhi01", "sdhi10", "sdhi11";

		};



		pinctrl: pin-controller@fcfe3000 {

		pinctrl: pinctrl@fcfe3000 {

			compatible = "renesas,r7s72100-ports";



			reg = <0xfcfe3000 0x4230>;

arch/arm/boot/dts/r7s9210.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ irqc: interrupt-controller@fcfef800 { 
			interrupt-map-mask = <7 0>;

		};



		pinctrl: pin-controller@fcffe000 {

		pinctrl: pinctrl@fcffe000 {

			compatible = "renesas,r7s9210-pinctrl";

			reg = <0xfcffe000 0x1000>;

arch/arm/boot/dts/r8a73a4.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ irqc1: interrupt-controller@e61c0200 { 
		power-domains = <&pd_c4>;

	};



	pfc: pin-controller@e6050000 {

	pfc: pinctrl@e6050000 {

		compatible = "renesas,pfc-r8a73a4";

		reg = <0 0xe6050000 0 0x9000>;

		gpio-controller;

arch/arm/boot/dts/r8a7740.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ scifb: serial@e6c30000 { 
		status = "disabled";

	};



	pfc: pin-controller@e6050000 {

	pfc: pinctrl@e6050000 {

		compatible = "renesas,pfc-r8a7740";

		reg = <0xe6050000 0x8000>,

		      <0xe605800c 0x20>;