Commit d2849a58 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm64-dt-for-v5.1' of... 

Merge tag 'renesas-arm64-dt-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/dt

Renesas ARM64 Based SoC DT Updates for v5.1

R-Car H3 (r8a7795) SoC
- Sort i2c and pciec0 nodes within soc node
R-Car H3 (r8a7795) and M3-W (r8a7796) SoCs
- Remove BUSIF0 settings from rcar_sound,ssi

R-Car M3-W (r8a7796) based Salvator-XS board
- Convert to new LVDS DT bindings

R-Car H3 (r8a7795), M3-W (r8a7796) and M3-N (r8a77965) based ULCB boards
- Use audio-graph-card to allow secondary sound device on kingfisher
  daugher board
- Add HDMI sound support

Kingfisher daughterboard for R-Car H3 (r8a7795), M3-W (r8a7796) and M3-N
(r8a77965) based ULCB boards
- Add pcm3168 sound codec

R-Car E3 (r8a77990) SoC
- Enable DMA for SCIF2

R-Car E3 (r8a77990) based Ebisu board
- HS400 for onboard eMMC
- Use simple-audio-card rather than simple-scu-audio-card
- Correct EthernetAVB phy mode as rgmii
- Add backlight and follow-up to correct duplicate regulator number

R-Car V3M (r8a77970) based v3msk starter kit
- Specify EtherAVB PHY IRQ now that GPIO support is present

R-Car D3 (r8a77995) based draak board
- Set better backlight levels

RZ/G2M (r8a774a1) SoC
- Correct hsusb reg size

RZ/G2E (r8a774c0) SoC
- Intial SoC DT
- Add: and SYS-DMAC controller, SCIF, HSCIF, INTC-EX
  PFC, GPIO, Ethernet AVB, watchdog, secondary CA3 core, SDHI,
  I2C, IIC-DVFS, IPMU, CAN, thermal, MSIOF, audio, PWM, display output,
  USB2.0, USB-DMAC, HSUSB, USB3.0, IPMMU, PCIe, VIN and CSI-2 support
- A follow-up patch included in this pull-request enables DMA for SCIF2
  so that DMA is enabled for all SCIF nodes

* tag 'renesas-arm64-dt-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

: (44 commits)
  arm64: dts: renesas: r8a77990: ebisu: Enable HS400 of SDHI3
  arm64: dts: renesas: r8a77990: Enable DMA for SCIF2
  arm64: dts: renesas: r8a774c0: Enable DMA for SCIF2
  arm64: dts: renesas: r8a77990: ebisu: Fix backlight regulator numbering
  arm64: dts: renesas: v3msk: specify EtherAVB PHY IRQ
  arm64: dts: renesas: r8a77990-ebisu: use simple-audio-card
  arm64: dts: renesas: r8a7796: remove BUSIF0 settings from rcar_sound,ssi
  arm64: dts: renesas: r8a7795: remove BUSIF0 settings from rcar_sound,ssi
  arm64: dts: renesas: ulcb-kf: add pcm3168 sound codec
  arm64: dts: renesas: ulcb: add HDMI sound support
  arm64: dts: renesas: ulcb: use audio-graph-card
  arm64: dts: renesas: r8a7796: salvator-xs: Convert to new LVDS DT bindings
  arm64: dts: renesas: r8a77990: Sort i2c nodes within soc node
  arm64: dts: renesas: r8a77990: sort pciec0 node within soc node
  arm64: dts: renesas: r8a774a1: Fix hsusb reg size
  arm64: dts: renesas: r8a774c0: Add VIN and CSI-2 device nodes
  arm64: dts: renesas: r8a774c0: Add PCIe device node
  arm64: dts: renesas: r8a774c0: Connect RZ/G2E Audio-DMAC to IPMMU
  arm64: dts: renesas: r8a774c0: Connect RZ/G2E AVB to IPMMU
  arm64: dts: renesas: r8a774c0: Connect RZ/G2E SYS-DMAC to IPMMU
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4165ef5d 3e279a1d

arch/arm64/boot/dts/renesas/r8a774a1.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ 
		hsusb: usb@e6590000 {

			compatible = "renesas,usbhs-r8a774a1",

				     "renesas,rcar-gen3-usbhs";

			reg = <0 0xe6590000 0 0x100>;

			reg = <0 0xe6590000 0 0x200>;

			interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 704>;

			dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,

arch/arm64/boot/dts/renesas/r8a774c0.dtsi

0 → 100644
+1751 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm64/boot/dts/renesas/r8a7795.dtsi

+20 −20
Original line number Diff line number Diff line
@@ -2174,53 +2174,53 @@ 
			rcar_sound,ssi {

				ssi0: ssi-0 {

					interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x01>, <&audma1 0x02>;

					dma-names = "rx", "tx";

				};

				ssi1: ssi-1 {

					 interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x03>, <&audma1 0x04>;

					dma-names = "rx", "tx";

				};

				ssi2: ssi-2 {

					interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x05>, <&audma1 0x06>;

					dma-names = "rx", "tx";

				};

				ssi3: ssi-3 {

					interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x07>, <&audma1 0x08>;

					dma-names = "rx", "tx";

				};

				ssi4: ssi-4 {

					interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x09>, <&audma1 0x0a>;

					dma-names = "rx", "tx";

				};

				ssi5: ssi-5 {

					interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x0b>, <&audma1 0x0c>;

					dma-names = "rx", "tx";

				};

				ssi6: ssi-6 {

					interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x0d>, <&audma1 0x0e>;

					dma-names = "rx", "tx";

				};

				ssi7: ssi-7 {

					interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x0f>, <&audma1 0x10>;

					dma-names = "rx", "tx";

				};

				ssi8: ssi-8 {

					interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x11>, <&audma1 0x12>;

					dma-names = "rx", "tx";

				};

				ssi9: ssi-9 {

					interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x13>, <&audma1 0x14>;

					dma-names = "rx", "tx";

				};

			};

		};

arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts

+1 −2
Original line number Diff line number Diff line
@@ -29,11 +29,10 @@ 
	clocks = <&cpg CPG_MOD 724>,

		 <&cpg CPG_MOD 723>,

		 <&cpg CPG_MOD 722>,

		 <&cpg CPG_MOD 727>,

		 <&versaclock6 1>,

		 <&x21_clk>,

		 <&versaclock6 2>;

	clock-names = "du.0", "du.1", "du.2", "lvds.0",

	clock-names = "du.0", "du.1", "du.2",

		      "dclkin.0", "dclkin.1", "dclkin.2";

};

arch/arm64/boot/dts/renesas/r8a7796.dtsi

+20 −20
Original line number Diff line number Diff line
@@ -2110,53 +2110,53 @@ 
			rcar_sound,ssi {

				ssi0: ssi-0 {

					interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x01>, <&audma1 0x02>;

					dma-names = "rx", "tx";

				};

				ssi1: ssi-1 {

					interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x03>, <&audma1 0x04>;

					dma-names = "rx", "tx";

				};

				ssi2: ssi-2 {

					interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x05>, <&audma1 0x06>;

					dma-names = "rx", "tx";

				};

				ssi3: ssi-3 {

					interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x07>, <&audma1 0x08>;

					dma-names = "rx", "tx";

				};

				ssi4: ssi-4 {

					interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x09>, <&audma1 0x0a>;

					dma-names = "rx", "tx";

				};

				ssi5: ssi-5 {

					interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x0b>, <&audma1 0x0c>;

					dma-names = "rx", "tx";

				};

				ssi6: ssi-6 {

					interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x0d>, <&audma1 0x0e>;

					dma-names = "rx", "tx";

				};

				ssi7: ssi-7 {

					interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x0f>, <&audma1 0x10>;

					dma-names = "rx", "tx";

				};

				ssi8: ssi-8 {

					interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x11>, <&audma1 0x12>;

					dma-names = "rx", "tx";

				};

				ssi9: ssi-9 {

					interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;

					dma-names = "rx", "tx", "rxu", "txu";

					dmas = <&audma0 0x13>, <&audma1 0x14>;

					dma-names = "rx", "tx";

				};

			};

CRA Git | Maintained and supported by SUSTech CRA and CCSE