Unverified Commit 272614ec authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Renesas ARM DT updates for v5.15

  - Switches support for the Draak and Ebisu development boards,
  - I2C support on RZ/G2L,
  - I2C EEPROM support on the Ebisu development board,
  - Sound support for the R-Car D3 SoC and the Draak development board,
  - Support for the new R-Car H3e-2G and M3e-2G SoCs on the Salvator-XS
    and ULCB development boards,
  - IOMMU support for DMAC, EtherAVB, and SDHI on the R-Car M3-W+ SoC,
  - Miscellaneous fixes and improvements.

* tag 'renesas-arm-dt-for-v5.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: (29 commits)
  arm64: dts: renesas: r8a77961: Add iommus to ipmmu_ds[01] related nodes
  arm64: dts: renesas: Add support for M3ULCB+Kingfisher with R-Car M3e-2G
  arm64: dts: renesas: Add support for M3ULCB with R-Car M3e-2G
  arm64: dts: renesas: Add support for Salvator-XS with R-Car M3e-2G
  arm64: dts: renesas: Add support for H3ULCB+Kingfisher with R-Car H3e-2G
  arm64: dts: renesas: Add support for H3ULCB with R-Car H3e-2G
  arm64: dts: renesas: Add support for Salvator-XS with R-Car H3e-2G
  arm64: dts: renesas: Add Renesas R8A779M3 SoC support
  arm64: dts: renesas: Add Renesas R8A779M1 SoC support
  arm64: dts: renesas: hihope-rzg2-ex: Add EtherAVB internal rx delay
  arm64: dts: renesas: r8a77995: draak: Add R-Car Sound support
  arm64: dts: renesas: r8a77995: Add R-Car Sound support
  arm64: dts: renesas: rcar-gen3: Add SoC model to comment headers
  arm64: dts: renesas: r8a77990: ebisu: Add I2C EEPROM for PMIC
  arm64: dts: renesas: r8a77995: draak: Remove bogus adv7511w properties
  arm64: dts: renesas: beacon: Enable micbias
  arm64: dts: renesas: r9a07g044: Add I2C nodes
  arm64: dts: renesas: r8a779a0: Restore sort order
  arm64: dts: renesas: r8a77990: ebisu: Add SW4 support
  arm64: dts: renesas: r8a77995: draak: Add SW56 support
  ...

Link: https://lore.kernel.org/r/cover.1627650696.git.geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 062f82a0 651f8cff

arch/arm/boot/dts/r8a73a4.dtsi

+0 −44
Original line number Diff line number Diff line
@@ -72,50 +72,6 @@ dbsc2: memory-controller@e67a0000 { 
		power-domains = <&pd_a3bc>;

	};



	dmac: dma-multiplexer {

		compatible = "renesas,shdma-mux";

		#dma-cells = <1>;

		dma-channels = <20>;

		dma-requests = <256>;

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		dma0: dma-controller@e6700020 {

			compatible = "renesas,shdma-r8a73a4";

			reg = <0 0xe6700020 0 0x89e0>;

			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "error",

					"ch0", "ch1", "ch2", "ch3",

					"ch4", "ch5", "ch6", "ch7",

					"ch8", "ch9", "ch10", "ch11",

					"ch12", "ch13", "ch14", "ch15",

					"ch16", "ch17", "ch18", "ch19";

			clocks = <&mstp2_clks R8A73A4_CLK_DMAC>;

			power-domains = <&pd_a3sp>;

		};

	};



	i2c5: i2c@e60b0000 {

		#address-cells = <1>;

		#size-cells = <0>;

arch/arm/boot/dts/r8a7742.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -602,7 +602,9 @@ iic2: i2c@e6520000 { 
		iic3: i2c@e60b0000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "renesas,iic-r8a7742";

			compatible = "renesas,iic-r8a7742",

				     "renesas,rcar-gen2-iic",

				     "renesas,rmobile-iic";

			reg = <0 0xe60b0000 0 0x425>;

			interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 926>;

arch/arm/boot/dts/r8a7743.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -552,7 +552,9 @@ iic3: i2c@e60b0000 { 
			/* doesn't need pinmux */

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "renesas,iic-r8a7743";

			compatible = "renesas,iic-r8a7743",

				     "renesas,rcar-gen2-iic",

				     "renesas,rmobile-iic";

			reg = <0 0xe60b0000 0 0x425>;

			interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 926>;

arch/arm/boot/dts/r8a7744.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -552,7 +552,9 @@ iic3: i2c@e60b0000 { 
			/* doesn't need pinmux */

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "renesas,iic-r8a7744";

			compatible = "renesas,iic-r8a7744",

				     "renesas,rcar-gen2-iic",

				     "renesas,rmobile-iic";

			reg = <0 0xe60b0000 0 0x425>;

			interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 926>;

arch/arm64/boot/dts/renesas/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -63,4 +63,12 @@ dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb 


dtb-$(CONFIG_ARCH_R8A779A0) += r8a779a0-falcon.dtb



dtb-$(CONFIG_ARCH_R8A77951) += r8a779m1-salvator-xs.dtb

dtb-$(CONFIG_ARCH_R8A77951) += r8a779m1-ulcb.dtb

dtb-$(CONFIG_ARCH_R8A77951) += r8a779m1-ulcb-kf.dtb



dtb-$(CONFIG_ARCH_R8A77961) += r8a779m3-salvator-xs.dtb

dtb-$(CONFIG_ARCH_R8A77961) += r8a779m3-ulcb.dtb

dtb-$(CONFIG_ARCH_R8A77961) += r8a779m3-ulcb-kf.dtb



dtb-$(CONFIG_ARCH_R9A07G044) += r9a07g044l2-smarc.dtb