Commit e3d37813 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-arm64-dt-for-v4.21' of... 

Merge tag 'renesas-arm64-dt-for-v4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Renesas ARM64 Based SoC DT Updates for v4.21

* H3 (r8a7795) SoC:
  - Remove unneeded sound #address/size-cells

* M3-W (r8a7796) SoC:
  - Describe CMT (Compare Match Timer) devices in DT
  - Describe I2C-DVFS device node in DT

* M3-N (r8a77965) SoC:
  - Describe CAN, CANFD and LVDS in DT

* R-Car H3 (r8a7795) and M3-W (r8a7796) SoCs:
  - Describe CPU topology, capacity and cooling maps in DT
  - Add SSIU support to R-Car audio

* R-Car H3 (r8a7795), M3-W (r8a7796) and M3-N (r8a77965) SoCs:
  - Extend register range of HSUSB device to match documentation

* R-Car H3 (r8a7795), M3-W (r8a7796) and M3-N (r8a77965) based
  Salvator-X, Salvator-XS and ULCB boards:
  - Switch eMMC bus to 1V8

* R-Car H3 (r8a7795), M3-W (r8a7796) and M3-N (r8a77965) based
  Salvator-X and Salvator-XS boards:
  - Describe USB3.0 xHCI host and prerepheral devices as companions

* R-Car E3 (r8a77990) SoC:
  - Add thermal support
  - Add support for interupt controller for external devices (INTC-EX)
  - Describe all SCIF devices and SYS-DMA for I2C and MSIOF devices

* R-Car E3 (r8a77990) based Ebisu board:
  - Enable SDHI, CAN, CANFD, audio and USB3.0
  - Describe serial console pins

* R-Car E3 (r8a77990) based Ebisu and
  R-Car D3 (r8a77995) based Draak board:
  - Enable USB2.0 peripheral device

* R-Car M3-N (r8a77965), E3 (r8a77990) and V3H (r8a77980) SoCs:
  - Connect EtherAVB to IPMMU

* R-Car V3M (r8a77970) and V3H (r8a77980) SoCs:
  - Describe TMU (timer unit), PWM timer controller and MSIOF devides in DT
  - Add thermal support

* RZ/G2M (r8a774a1) SoC:
  - Use clock and power index macros
  - Describe VIN, CSI-2 and CAN devices in DT

* tag 'renesas-arm64-dt-for-v4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

: (40 commits)
  arm64: dts: renesas: Add all CPUs in cooling maps
  arm64: dts: renesas: r8a77990: add thermal device support
  arm64: dts: renesas: r8a77990: Enable I2C DMA
  arm64: dts: renesas: r8a7796: Add CMT device nodes
  arm64: dts: renesas: r8a7796: add SSIU support for sound
  arm64: dts: renesas: r8a77990: Add I2C-DVFS device node
  arm64: dts: renesas: r8a77990: ebisu: Add and enable CAN,FD device nodes
  arm64: dts: renesas: r8a77965: Add CAN and CANFD controller nodes
  arm64: dts: renesas: r8a77990: ebisu: Add and enable PCIe device node
  arm64: dts: renesas: Add CPU capacity-dmips-mhz
  arm64: dts: renesas: Add CPU topology on R-Car Gen3 SoCs
  arm64: dts: renesas: r8a774a1: Replace clock magic numbers
  arm64: dts: renesas: r8a774a1: Replace power magic numbers
  arm64: dts: renesas: r8a7795: add SSIU support for sound
  arm64: dts: renesas: r8a77990: Fix VIN endpoint numbering
  arm64: dts: renesas: ebisu: Add and enable SDHI device nodes
  arm64: dts: renesas: ebisu: Add serial console pins
  arm64: dts: renesas: Switch eMMC bus to 1V8 on Salvator-X and ULCB
  arm64: dts: renesas: r8a77990: Add all HSCIF nodes
  arm64: dts: renesas: r8a779{7|8}0: add TMU support
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 51ea46e8 275e4eb3

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

+499 −107

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ 
	ports {

		/* rsnd_port0 is on salvator-common */

		rsnd_port1: port@1 {

			reg = <1>;

			rsnd_endpoint1: endpoint {

				remote-endpoint = <&dw_hdmi0_snd_in>;
@@ -123,6 +124,7 @@ 
			};

		};

		rsnd_port2: port@2 {

			reg = <2>;

			rsnd_endpoint2: endpoint {

				remote-endpoint = <&dw_hdmi1_snd_in>;

arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ 
	ports {

		/* rsnd_port0 is on salvator-common */

		rsnd_port1: port@1 {

			reg = <1>;

			rsnd_endpoint1: endpoint {

				remote-endpoint = <&dw_hdmi0_snd_in>;
@@ -123,6 +124,7 @@ 
			};

		};

		rsnd_port2: port@2 {

			reg = <2>;

			rsnd_endpoint2: endpoint {

				remote-endpoint = <&dw_hdmi1_snd_in>;

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

+2 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ 
	ports {

		/* rsnd_port0 is on salvator-common */

		rsnd_port1: port@1 {

			reg = <1>;

			rsnd_endpoint1: endpoint {

				remote-endpoint = <&dw_hdmi0_snd_in>;
@@ -138,6 +139,7 @@ 
			};

		};

		rsnd_port2: port@2 {

			reg = <2>;

			rsnd_endpoint2: endpoint {

				remote-endpoint = <&dw_hdmi1_snd_in>;

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

+265 −19
Original line number Diff line number Diff line
@@ -116,6 +116,38 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		cpu-map {

			cluster0 {

				core0 {

					cpu = <&a57_0>;

				};

				core1 {

					cpu = <&a57_1>;

				};

				core2 {

					cpu = <&a57_2>;

				};

				core3 {

					cpu = <&a57_3>;

				};

			};



			cluster1 {

				core0 {

					cpu = <&a53_0>;

				};

				core1 {

					cpu = <&a53_1>;

				};

				core2 {

					cpu = <&a53_2>;

				};

				core3 {

					cpu = <&a53_3>;

				};

			};

		};



		a57_0: cpu@0 {

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x0>;
@@ -125,6 +157,7 @@ 
			enable-method = "psci";

			clocks = <&cpg CPG_CORE R8A7795_CLK_Z>;

			operating-points-v2 = <&cluster0_opp>;

			capacity-dmips-mhz = <1024>;

			#cooling-cells = <2>;

		};
@@ -137,6 +170,7 @@ 
			enable-method = "psci";

			clocks = <&cpg CPG_CORE R8A7795_CLK_Z>;

			operating-points-v2 = <&cluster0_opp>;

			capacity-dmips-mhz = <1024>;

			#cooling-cells = <2>;

		};
@@ -149,6 +183,7 @@ 
			enable-method = "psci";

			clocks = <&cpg CPG_CORE R8A7795_CLK_Z>;

			operating-points-v2 = <&cluster0_opp>;

			capacity-dmips-mhz = <1024>;

			#cooling-cells = <2>;

		};
@@ -161,6 +196,7 @@ 
			enable-method = "psci";

			clocks = <&cpg CPG_CORE R8A7795_CLK_Z>;

			operating-points-v2 = <&cluster0_opp>;

			capacity-dmips-mhz = <1024>;

			#cooling-cells = <2>;

		};
@@ -173,6 +209,7 @@ 
			enable-method = "psci";

			clocks = <&cpg CPG_CORE R8A7795_CLK_Z2>;

			operating-points-v2 = <&cluster1_opp>;

			capacity-dmips-mhz = <535>;

		};



		a53_1: cpu@101 {
@@ -184,6 +221,7 @@ 
			enable-method = "psci";

			clocks = <&cpg CPG_CORE R8A7795_CLK_Z2>;

			operating-points-v2 = <&cluster1_opp>;

			capacity-dmips-mhz = <535>;

		};



		a53_2: cpu@102 {
@@ -195,6 +233,7 @@ 
			enable-method = "psci";

			clocks = <&cpg CPG_CORE R8A7795_CLK_Z2>;

			operating-points-v2 = <&cluster1_opp>;

			capacity-dmips-mhz = <535>;

		};



		a53_3: cpu@103 {
@@ -206,6 +245,7 @@ 
			enable-method = "psci";

			clocks = <&cpg CPG_CORE R8A7795_CLK_Z2>;

			operating-points-v2 = <&cluster1_opp>;

			capacity-dmips-mhz = <535>;

		};



		L2_CA57: cache-controller-0 {
@@ -695,7 +735,7 @@ 
		hsusb: usb@e6590000 {

			compatible = "renesas,usbhs-r8a7795",

				     "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>, <&cpg CPG_MOD 703>;

			dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
@@ -712,7 +752,7 @@ 
		hsusb3: usb@e659c000 {

			compatible = "renesas,usbhs-r8a7795",

				     "renesas,rcar-gen3-usbhs";

			reg = <0 0xe659c000 0 0x100>;

			reg = <0 0xe659c000 0 0x200>;

			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 705>, <&cpg CPG_MOD 700>;

			dmas = <&usb_dmac2 0>, <&usb_dmac2 1>,
@@ -1920,6 +1960,217 @@ 
				};

			};



			rcar_sound,ssiu {

				ssiu00: ssiu-0 {

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

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

				};

				ssiu01: ssiu-1 {

					dmas = <&audma0 0x35>, <&audma1 0x36>;

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

				};

				ssiu02: ssiu-2 {

					dmas = <&audma0 0x37>, <&audma1 0x38>;

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

				};

				ssiu03: ssiu-3 {

					dmas = <&audma0 0x47>, <&audma1 0x48>;

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

				};

				ssiu04: ssiu-4 {

					dmas = <&audma0 0x3F>, <&audma1 0x40>;

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

				};

				ssiu05: ssiu-5 {

					dmas = <&audma0 0x43>, <&audma1 0x44>;

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

				};

				ssiu06: ssiu-6 {

					dmas = <&audma0 0x4F>, <&audma1 0x50>;

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

				};

				ssiu07: ssiu-7 {

					dmas = <&audma0 0x53>, <&audma1 0x54>;

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

				};

				ssiu10: ssiu-8 {

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

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

				};

				ssiu11: ssiu-9 {

					dmas = <&audma0 0x4B>, <&audma1 0x4C>;

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

				};

				ssiu12: ssiu-10 {

					dmas = <&audma0 0x57>, <&audma1 0x58>;

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

				};

				ssiu13: ssiu-11 {

					dmas = <&audma0 0x59>, <&audma1 0x5A>;

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

				};

				ssiu14: ssiu-12 {

					dmas = <&audma0 0x5F>, <&audma1 0x60>;

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

				};

				ssiu15: ssiu-13 {

					dmas = <&audma0 0xC3>, <&audma1 0xC4>;

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

				};

				ssiu16: ssiu-14 {

					dmas = <&audma0 0xC7>, <&audma1 0xC8>;

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

				};

				ssiu17: ssiu-15 {

					dmas = <&audma0 0xCB>, <&audma1 0xCC>;

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

				};

				ssiu20: ssiu-16 {

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

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

				};

				ssiu21: ssiu-17 {

					dmas = <&audma0 0x67>, <&audma1 0x68>;

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

				};

				ssiu22: ssiu-18 {

					dmas = <&audma0 0x6B>, <&audma1 0x6C>;

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

				};

				ssiu23: ssiu-19 {

					dmas = <&audma0 0x6D>, <&audma1 0x6E>;

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

				};

				ssiu24: ssiu-20 {

					dmas = <&audma0 0xCF>, <&audma1 0xCE>;

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

				};

				ssiu25: ssiu-21 {

					dmas = <&audma0 0xEB>, <&audma1 0xEC>;

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

				};

				ssiu26: ssiu-22 {

					dmas = <&audma0 0xED>, <&audma1 0xEE>;

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

				};

				ssiu27: ssiu-23 {

					dmas = <&audma0 0xEF>, <&audma1 0xF0>;

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

				};

				ssiu30: ssiu-24 {

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

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

				};

				ssiu31: ssiu-25 {

					dmas = <&audma0 0x21>, <&audma1 0x22>;

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

				};

				ssiu32: ssiu-26 {

					dmas = <&audma0 0x23>, <&audma1 0x24>;

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

				};

				ssiu33: ssiu-27 {

					dmas = <&audma0 0x25>, <&audma1 0x26>;

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

				};

				ssiu34: ssiu-28 {

					dmas = <&audma0 0x27>, <&audma1 0x28>;

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

				};

				ssiu35: ssiu-29 {

					dmas = <&audma0 0x29>, <&audma1 0x2A>;

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

				};

				ssiu36: ssiu-30 {

					dmas = <&audma0 0x2B>, <&audma1 0x2C>;

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

				};

				ssiu37: ssiu-31 {

					dmas = <&audma0 0x2D>, <&audma1 0x2E>;

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

				};

				ssiu40: ssiu-32 {

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

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

				};

				ssiu41: ssiu-33 {

					dmas = <&audma0 0x17>, <&audma1 0x18>;

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

				};

				ssiu42: ssiu-34 {

					dmas = <&audma0 0x19>, <&audma1 0x1A>;

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

				};

				ssiu43: ssiu-35 {

					dmas = <&audma0 0x1B>, <&audma1 0x1C>;

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

				};

				ssiu44: ssiu-36 {

					dmas = <&audma0 0x1D>, <&audma1 0x1E>;

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

				};

				ssiu45: ssiu-37 {

					dmas = <&audma0 0x1F>, <&audma1 0x20>;

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

				};

				ssiu46: ssiu-38 {

					dmas = <&audma0 0x31>, <&audma1 0x32>;

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

				};

				ssiu47: ssiu-39 {

					dmas = <&audma0 0x33>, <&audma1 0x34>;

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

				};

				ssiu50: ssiu-40 {

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

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

				};

				ssiu60: ssiu-41 {

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

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

				};

				ssiu70: ssiu-42 {

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

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

				};

				ssiu80: ssiu-43 {

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

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

				};

				ssiu90: ssiu-44 {

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

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

				};

				ssiu91: ssiu-45 {

					dmas = <&audma0 0x7F>, <&audma1 0x80>;

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

				};

				ssiu92: ssiu-46 {

					dmas = <&audma0 0x81>, <&audma1 0x82>;

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

				};

				ssiu93: ssiu-47 {

					dmas = <&audma0 0x83>, <&audma1 0x84>;

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

				};

				ssiu94: ssiu-48 {

					dmas = <&audma0 0xA3>, <&audma1 0xA4>;

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

				};

				ssiu95: ssiu-49 {

					dmas = <&audma0 0xA5>, <&audma1 0xA6>;

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

				};

				ssiu96: ssiu-50 {

					dmas = <&audma0 0xA7>, <&audma1 0xA8>;

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

				};

				ssiu97: ssiu-51 {

					dmas = <&audma0 0xA9>, <&audma1 0xAA>;

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

				};

			};



			rcar_sound,ssi {

				ssi0: ssi-0 {

					interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
@@ -1972,20 +2223,6 @@ 
					dma-names = "rx", "tx", "rxu", "txu";

				};

			};



			ports {

				#address-cells = <1>;

				#size-cells = <0>;

				port@0 {

					reg = <0>;

				};

				port@1 {

					reg = <1>;

				};

				port@2 {

					reg = <2>;

				};

			};

		};



		audma0: dma-controller@ec700000 {
@@ -2878,7 +3115,10 @@ 
			cooling-maps {

				map0 {

					trip = <&sensor1_passive>;

					cooling-device = <&a57_0 4 4>;

					cooling-device = <&a57_0 4 4>,

							 <&a57_1 4 4>,

							 <&a57_2 4 4>,

							 <&a57_3 4 4>;

				};

			};

		};
@@ -2904,7 +3144,10 @@ 
			cooling-maps {

				map0 {

					trip = <&sensor2_passive>;

					cooling-device = <&a57_0 4 4>;

					cooling-device = <&a57_0 4 4>,

							 <&a57_1 4 4>,

							 <&a57_2 4 4>,

							 <&a57_3 4 4>;

				};

			};

		};
@@ -2930,7 +3173,10 @@ 
			cooling-maps {

				map0 {

					trip = <&sensor3_passive>;

					cooling-device = <&a57_0 4 4>;

					cooling-device = <&a57_0 4 4>,

							 <&a57_1 4 4>,

							 <&a57_2 4 4>,

							 <&a57_3 4 4>;

				};

			};

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE