Commit 71dbe952 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-dt-for-v5.8-tag1' of...

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

Renesas ARM DT updates for v5.8

  - USB, UART, PWM, and PCIe support for R-Car M3-W+,
  - PWM (16-bit Timer Pulse Unit and PWM Timers) support for R-Car M2-W,
  - Minor fixes and cleanups.

* tag 'renesas-arm-dt-for-v5.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  arm64: dts: renesas: Fix IOMMU device node names
  ARM: dts: renesas: Fix IOMMU device node names
  ARM: dts: shmobile: Update CMT1 compatible values
  ARM: dts: r8a7791: Add PWM device nodes
  ARM: dts: r8a7791: Add TPU device node
  arm64: dts: renesas: r8a77961: Add PCIe device nodes
  arm64: dts: renesas: r8a77961: Add PWM device nodes
  arm64: dts: renesas: r8a77961: Add SCIF and HSCIF nodes
  arm64: dts: renesas: r8a77961: Add USB3.0 device nodes
  arm64: dts: renesas: r8a77961: Add USB2.0 device nodes

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3f0be4df cf8ae446
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@
	};

	cmt1: timer@e6138000 {
		compatible = "renesas,cmt-48-r8a7740", "renesas,cmt-48";
		compatible = "renesas,r8a7740-cmt1";
		reg = <0xe6138000 0x170>;
		interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&mstp3_clks R8A7740_CLK_CMT1>;
+6 −6
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@
			#thermal-sensor-cells = <0>;
		};

		ipmmu_sy0: mmu@e6280000 {
		ipmmu_sy0: iommu@e6280000 {
			compatible = "renesas,ipmmu-r8a7743",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe6280000 0 0x1000>;
@@ -348,7 +348,7 @@
			status = "disabled";
		};

		ipmmu_sy1: mmu@e6290000 {
		ipmmu_sy1: iommu@e6290000 {
			compatible = "renesas,ipmmu-r8a7743",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe6290000 0 0x1000>;
@@ -357,7 +357,7 @@
			status = "disabled";
		};

		ipmmu_ds: mmu@e6740000 {
		ipmmu_ds: iommu@e6740000 {
			compatible = "renesas,ipmmu-r8a7743",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe6740000 0 0x1000>;
@@ -367,7 +367,7 @@
			status = "disabled";
		};

		ipmmu_mp: mmu@ec680000 {
		ipmmu_mp: iommu@ec680000 {
			compatible = "renesas,ipmmu-r8a7743",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xec680000 0 0x1000>;
@@ -376,7 +376,7 @@
			status = "disabled";
		};

		ipmmu_mx: mmu@fe951000 {
		ipmmu_mx: iommu@fe951000 {
			compatible = "renesas,ipmmu-r8a7743",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xfe951000 0 0x1000>;
@@ -386,7 +386,7 @@
			status = "disabled";
		};

		ipmmu_gp: mmu@e62a0000 {
		ipmmu_gp: iommu@e62a0000 {
			compatible = "renesas,ipmmu-r8a7743",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe62a0000 0 0x1000>;
+6 −6
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@
			#thermal-sensor-cells = <0>;
		};

		ipmmu_sy0: mmu@e6280000 {
		ipmmu_sy0: iommu@e6280000 {
			compatible = "renesas,ipmmu-r8a7744",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe6280000 0 0x1000>;
@@ -348,7 +348,7 @@
			status = "disabled";
		};

		ipmmu_sy1: mmu@e6290000 {
		ipmmu_sy1: iommu@e6290000 {
			compatible = "renesas,ipmmu-r8a7744",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe6290000 0 0x1000>;
@@ -357,7 +357,7 @@
			status = "disabled";
		};

		ipmmu_ds: mmu@e6740000 {
		ipmmu_ds: iommu@e6740000 {
			compatible = "renesas,ipmmu-r8a7744",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe6740000 0 0x1000>;
@@ -367,7 +367,7 @@
			status = "disabled";
		};

		ipmmu_mp: mmu@ec680000 {
		ipmmu_mp: iommu@ec680000 {
			compatible = "renesas,ipmmu-r8a7744",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xec680000 0 0x1000>;
@@ -376,7 +376,7 @@
			status = "disabled";
		};

		ipmmu_mx: mmu@fe951000 {
		ipmmu_mx: iommu@fe951000 {
			compatible = "renesas,ipmmu-r8a7744",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xfe951000 0 0x1000>;
@@ -386,7 +386,7 @@
			status = "disabled";
		};

		ipmmu_gp: mmu@e62a0000 {
		ipmmu_gp: iommu@e62a0000 {
			compatible = "renesas,ipmmu-r8a7744",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe62a0000 0 0x1000>;
+6 −6
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@
			resets = <&cpg 407>;
		};

		ipmmu_sy0: mmu@e6280000 {
		ipmmu_sy0: iommu@e6280000 {
			compatible = "renesas,ipmmu-r8a7745",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe6280000 0 0x1000>;
@@ -312,7 +312,7 @@
			status = "disabled";
		};

		ipmmu_sy1: mmu@e6290000 {
		ipmmu_sy1: iommu@e6290000 {
			compatible = "renesas,ipmmu-r8a7745",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe6290000 0 0x1000>;
@@ -321,7 +321,7 @@
			status = "disabled";
		};

		ipmmu_ds: mmu@e6740000 {
		ipmmu_ds: iommu@e6740000 {
			compatible = "renesas,ipmmu-r8a7745",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe6740000 0 0x1000>;
@@ -331,7 +331,7 @@
			status = "disabled";
		};

		ipmmu_mp: mmu@ec680000 {
		ipmmu_mp: iommu@ec680000 {
			compatible = "renesas,ipmmu-r8a7745",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xec680000 0 0x1000>;
@@ -340,7 +340,7 @@
			status = "disabled";
		};

		ipmmu_mx: mmu@fe951000 {
		ipmmu_mx: iommu@fe951000 {
			compatible = "renesas,ipmmu-r8a7745",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xfe951000 0 0x1000>;
@@ -350,7 +350,7 @@
			status = "disabled";
		};

		ipmmu_gp: mmu@e62a0000 {
		ipmmu_gp: iommu@e62a0000 {
			compatible = "renesas,ipmmu-r8a7745",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe62a0000 0 0x1000>;
+6 −6
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@
			#thermal-sensor-cells = <0>;
		};

		ipmmu_sy0: mmu@e6280000 {
		ipmmu_sy0: iommu@e6280000 {
			compatible = "renesas,ipmmu-r8a7790",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe6280000 0 0x1000>;
@@ -437,7 +437,7 @@
			status = "disabled";
		};

		ipmmu_sy1: mmu@e6290000 {
		ipmmu_sy1: iommu@e6290000 {
			compatible = "renesas,ipmmu-r8a7790",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe6290000 0 0x1000>;
@@ -446,7 +446,7 @@
			status = "disabled";
		};

		ipmmu_ds: mmu@e6740000 {
		ipmmu_ds: iommu@e6740000 {
			compatible = "renesas,ipmmu-r8a7790",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xe6740000 0 0x1000>;
@@ -456,7 +456,7 @@
			status = "disabled";
		};

		ipmmu_mp: mmu@ec680000 {
		ipmmu_mp: iommu@ec680000 {
			compatible = "renesas,ipmmu-r8a7790",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xec680000 0 0x1000>;
@@ -465,7 +465,7 @@
			status = "disabled";
		};

		ipmmu_mx: mmu@fe951000 {
		ipmmu_mx: iommu@fe951000 {
			compatible = "renesas,ipmmu-r8a7790",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xfe951000 0 0x1000>;
@@ -475,7 +475,7 @@
			status = "disabled";
		};

		ipmmu_rt: mmu@ffc80000 {
		ipmmu_rt: iommu@ffc80000 {
			compatible = "renesas,ipmmu-r8a7790",
				     "renesas,ipmmu-vmsa";
			reg = <0 0xffc80000 0 0x1000>;
Loading