Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'renesas-arm64-dt-for-v5.4-tag2' of... 

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

Renesas ARM64 DT updates for v5.4 (take two)

  - Sort nodes in various SoC and board DTSes,
  - HDMI sound for HiHope RZ/G2M and R-Car M3-N Salvator-X(S) boards,
  - Limit EtherAVB to 100Mbps on the Ebisu and Draak boards,
  - Small fixes and improvements.

* tag 'renesas-arm64-dt-for-v5.4-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: (21 commits)
  arm64: dts: renesas: Update 'vsps' properties for readability
  arm64: dts: renesas: r8a77965-salvator-x(s): Enable HDMI sound
  arm64: dts: renesas: r8a774c0: Fix register range of display node
  arm64: dts: renesas: r8a77970: Sort nodes
  arm64: dts: renesas: r8a7796: Sort nodes
  arm64: dts: renesas: r8a774c0: Sort nodes
  arm64: dts: renesas: r8a774c0: cat874: Sort nodes
  arm64: dts: renesas: r8a774a1: Sort nodes
  arm64: dts: renesas: r8a77980: Fix IPMMU-VC0 base address
  arm64: dts: renesas: ebisu, draak: Limit EtherAVB to 100Mbps
  arm64: dts: renesas: hihope-common: Add HDMI audio support
  arm64: dts: renesas: r8a774c0: cat874: Add definition for 12V regulator
  arm64: dts: renesas: r8a774c0: Point LVDS0 to its companion LVDS1
  arm64: dts: renesas: r8a77995: Sort nodes
  arm64: dts: renesas: r8a77995: draak: Sort nodes
  arm64: dts: renesas: r8a77990: Sort nodes
  arm64: dts: renesas: r8a77990: ebisu: Sort nodes
  arm64: dts: renesas: r8a77980: v3hsk: Sort nodes
  arm64: dts: renesas: r8a77980: condor: Sort nodes
  arm64: dts: renesas: r8a77970: v3msk: Sort nodes
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents daf9d2db 38290431

arch/arm64/boot/dts/renesas/hihope-common.dtsi

+47 −0
Original line number Diff line number Diff line
@@ -81,6 +81,14 @@ 
		regulator-always-on;

	};



	sound_card: sound {

		compatible = "audio-graph-card";



		label = "rcar-sound";



		dais = <&rsnd_port0>;

	};



	vbus0_usb2: regulator-vbus0-usb2 {

		compatible = "regulator-fixed";
@@ -129,6 +137,10 @@ 
	};

};



&audio_clk_a {

	clock-frequency = <22579200>;

};



&du {

	clocks = <&cpg CPG_MOD 724>,

		 <&cpg CPG_MOD 723>,
@@ -176,6 +188,12 @@ 
				remote-endpoint = <&hdmi0_con>;

			};

		};

		port@2 {

			reg = <2>;

			dw_hdmi0_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint0>;

			};

		};

	};

};
@@ -272,6 +290,11 @@ 
		power-source = <1800>;

	};



	sound_clk_pins: sound_clk {

		groups = "audio_clk_a_a";

		function = "audio_clk";

	};



	usb0_pins: usb0 {

		groups = "usb0";

		function = "usb0";
@@ -295,6 +318,30 @@ 
	};

};



&rcar_sound {

	pinctrl-0 = <&sound_clk_pins>;

	pinctrl-names = "default";



	status = "okay";



	/* Single DAI */

	#sound-dai-cells = <0>;



	ports {

		rsnd_port0: port@0 {

			rsnd_endpoint0: endpoint {

				remote-endpoint = <&dw_hdmi0_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint0>;

				frame-master = <&rsnd_endpoint0>;



				playback = <&ssi2>;

			};

		};

	};

};



&rwdt {

	timeout-sec = <60>;

	status = "okay";

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

+87 −87
Original line number Diff line number Diff line
@@ -1726,6 +1726,28 @@ 
				      "ssi.1", "ssi.0";

			status = "disabled";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;

				port@0 {

					reg = <0>;

				};

				port@1 {

					reg = <1>;

				};

			};



			rcar_sound,ctu {

				ctu00: ctu-0 { };

				ctu01: ctu-1 { };

				ctu02: ctu-2 { };

				ctu03: ctu-3 { };

				ctu10: ctu-4 { };

				ctu11: ctu-5 { };

				ctu12: ctu-6 { };

				ctu13: ctu-7 { };

			};



			rcar_sound,dvc {

				dvc0: dvc-0 {

					dmas = <&audma1 0xbc>;
@@ -1742,17 +1764,6 @@ 
				mix1: mix-1 { };

			};



			rcar_sound,ctu {

				ctu00: ctu-0 { };

				ctu01: ctu-1 { };

				ctu02: ctu-2 { };

				ctu03: ctu-3 { };

				ctu10: ctu-4 { };

				ctu11: ctu-5 { };

				ctu12: ctu-6 { };

				ctu13: ctu-7 { };

			};



			rcar_sound,src {

				src0: src-0 {

					interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
@@ -1806,6 +1817,59 @@ 
				};

			};



			rcar_sound,ssi {

				ssi0: ssi-0 {

					interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;

					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>;

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

				};

				ssi2: ssi-2 {

					interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;

					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>;

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

				};

				ssi4: ssi-4 {

					interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;

					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>;

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

				};

				ssi6: ssi-6 {

					interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;

					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>;

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

				};

				ssi8: ssi-8 {

					interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;

					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>;

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

				};

			};



			rcar_sound,ssiu {

				ssiu00: ssiu-0 {

					dmas = <&audma0 0x15>, <&audma1 0x16>;
@@ -2016,70 +2080,6 @@ 
					dma-names = "rx", "tx";

				};

			};



			rcar_sound,ssi {

				ssi0: ssi-0 {

					interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;

					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>;

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

				};

				ssi2: ssi-2 {

					interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;

					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>;

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

				};

				ssi4: ssi-4 {

					interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;

					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>;

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

				};

				ssi6: ssi-6 {

					interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;

					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>;

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

				};

				ssi8: ssi-8 {

					interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;

					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>;

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

				};

			};



			ports {

				#address-cells = <1>;

				#size-cells = <0>;

				port@0 {

					reg = <0>;

				};

				port@1 {

					reg = <1>;

				};

			};

		};



		audma0: dma-controller@ec700000 {
@@ -2746,6 +2746,18 @@ 
			thermal-sensors = <&tsc 2>;

			sustainable-power = <3874>;



			cooling-maps {

				map0 {

					trip = <&target>;

					cooling-device = <&a57_0 0 2>;

					contribution = <1024>;

				};

				map1 {

					trip = <&target>;

					cooling-device = <&a53_0 0 2>;

					contribution = <1024>;

				};

			};

			trips {

				target: trip-point1 {

					temperature = <100000>;
@@ -2759,18 +2771,6 @@ 
					type = "critical";

				};

			};

			cooling-maps {

				map0 {

					trip = <&target>;

					cooling-device = <&a57_0 0 2>;

					contribution = <1024>;

				};

				map1 {

					trip = <&target>;

					cooling-device = <&a53_0 0 2>;

					contribution = <1024>;

				};

			};

		};

	};

arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts

+23 −14
Original line number Diff line number Diff line
@@ -65,6 +65,15 @@ 
		reg = <0x0 0x48000000 0x0 0x78000000>;

	};



	reg_12p0v: regulator-12p0v {

		compatible = "regulator-fixed";

		regulator-name = "D12.0V";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		regulator-boot-on;

		regulator-always-on;

	};



	sound: sound {

		compatible = "simple-audio-card";
@@ -73,13 +82,13 @@ 
		simple-audio-card,bitclock-master = <&sndcpu>;

		simple-audio-card,frame-master = <&sndcpu>;



		sndcpu: simple-audio-card,cpu {

			sound-dai = <&rcar_sound>;

		};



		sndcodec: simple-audio-card,codec {

			sound-dai = <&tda19988>;

		};



		sndcpu: simple-audio-card,cpu {

			sound-dai = <&rcar_sound>;

		};

	};



	vcc_sdhi0: regulator-vcc-sdhi0 {
@@ -271,16 +280,16 @@ 
		function = "du";

	};



	i2c1_pins: i2c1 {

		groups = "i2c1_b";

		function = "i2c1";

	};



	hscif2_pins: hscif2 {

		groups = "hscif2_data_a", "hscif2_ctrl_a";

		function = "hscif2";

	};



	i2c1_pins: i2c1 {

		groups = "i2c1_b";

		function = "i2c1";

	};



	scif2_pins: scif2 {

		groups = "scif2_data_a";

		function = "scif2";
@@ -304,16 +313,16 @@ 
		power-source = <1800>;

	};



	sound_pins: sound {

		groups = "ssi01239_ctrl", "ssi0_data";

		function = "ssi";

	};



	sound_clk_pins: sound_clk {

		groups = "audio_clkout1_a";

		function = "audio_clk";

	};



	sound_pins: sound {

		groups = "ssi01239_ctrl", "ssi0_data";

		function = "ssi";

	};



	usb30_pins: usb30 {

		groups = "usb30", "usb30_id";

		function = "usb30";

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

+49 −47
Original line number Diff line number Diff line
@@ -1371,6 +1371,17 @@ 
				      "ssi.1", "ssi.0";

			status = "disabled";



			rcar_sound,ctu {

				ctu00: ctu-0 { };

				ctu01: ctu-1 { };

				ctu02: ctu-2 { };

				ctu03: ctu-3 { };

				ctu10: ctu-4 { };

				ctu11: ctu-5 { };

				ctu12: ctu-6 { };

				ctu13: ctu-7 { };

			};



			rcar_sound,dvc {

				dvc0: dvc-0 {

					dmas = <&audma0 0xbc>;
@@ -1387,17 +1398,6 @@ 
				mix1: mix-1 { };

			};



			rcar_sound,ctu {

				ctu00: ctu-0 { };

				ctu01: ctu-1 { };

				ctu02: ctu-2 { };

				ctu03: ctu-3 { };

				ctu10: ctu-4 { };

				ctu11: ctu-5 { };

				ctu12: ctu-6 { };

				ctu13: ctu-7 { };

			};



			rcar_sound,src {

				src0: src-0 {

					interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
@@ -1706,13 +1706,24 @@ 
			renesas,fcp = <&fcpvb0>;

		};



		fcpvb0: fcp@fe96f000 {

			compatible = "renesas,fcpv";

			reg = <0 0xfe96f000 0 0x200>;

			clocks = <&cpg CPG_MOD 607>;

		vspd0: vsp@fea20000 {

			compatible = "renesas,vsp2";

			reg = <0 0xfea20000 0 0x7000>;

			interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 623>;

			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;

			resets = <&cpg 607>;

			iommus = <&ipmmu_vp0 5>;

			resets = <&cpg 623>;

			renesas,fcp = <&fcpvd0>;

		};



		vspd1: vsp@fea28000 {

			compatible = "renesas,vsp2";

			reg = <0 0xfea28000 0 0x7000>;

			interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 622>;

			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;

			resets = <&cpg 622>;

			renesas,fcp = <&fcpvd1>;

		};



		vspi0: vsp@fe9a0000 {
@@ -1725,23 +1736,13 @@ 
			renesas,fcp = <&fcpvi0>;

		};



		fcpvi0: fcp@fe9af000 {

		fcpvb0: fcp@fe96f000 {

			compatible = "renesas,fcpv";

			reg = <0 0xfe9af000 0 0x200>;

			clocks = <&cpg CPG_MOD 611>;

			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;

			resets = <&cpg 611>;

			iommus = <&ipmmu_vp0 8>;

		};



		vspd0: vsp@fea20000 {

			compatible = "renesas,vsp2";

			reg = <0 0xfea20000 0 0x7000>;

			interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 623>;

			reg = <0 0xfe96f000 0 0x200>;

			clocks = <&cpg CPG_MOD 607>;

			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;

			resets = <&cpg 623>;

			renesas,fcp = <&fcpvd0>;

			resets = <&cpg 607>;

			iommus = <&ipmmu_vp0 5>;

		};



		fcpvd0: fcp@fea27000 {
@@ -1753,16 +1754,6 @@ 
			iommus = <&ipmmu_vi0 8>;

		};



		vspd1: vsp@fea28000 {

			compatible = "renesas,vsp2";

			reg = <0 0xfea28000 0 0x7000>;

			interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 622>;

			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;

			resets = <&cpg 622>;

			renesas,fcp = <&fcpvd1>;

		};



		fcpvd1: fcp@fea2f000 {

			compatible = "renesas,fcpv";

			reg = <0 0xfea2f000 0 0x200>;
@@ -1772,6 +1763,15 @@ 
			iommus = <&ipmmu_vi0 9>;

		};



		fcpvi0: fcp@fe9af000 {

			compatible = "renesas,fcpv";

			reg = <0 0xfe9af000 0 0x200>;

			clocks = <&cpg CPG_MOD 611>;

			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;

			resets = <&cpg 611>;

			iommus = <&ipmmu_vp0 8>;

		};



		csi40: csi2@feaa0000 {

			compatible = "renesas,r8a774c0-csi2";

			reg = <0 0xfeaa0000 0 0x10000>;
@@ -1805,13 +1805,13 @@ 


		du: display@feb00000 {

			compatible = "renesas,du-r8a774c0";

			reg = <0 0xfeb00000 0 0x80000>;

			reg = <0 0xfeb00000 0 0x40000>;

			interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 724>,

				 <&cpg CPG_MOD 723>;

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

			vsps = <&vspd0 0 &vspd1 0>;

			vsps = <&vspd0 0>, <&vspd1 0>;

			status = "disabled";



			ports {
@@ -1848,6 +1848,8 @@ 
			resets = <&cpg 727>;

			status = "disabled";



			renesas,companion = <&lvds1>;



			ports {

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1906,6 +1908,9 @@ 
			polling-delay = <1000>;

			thermal-sensors = <&thermal>;



			cooling-maps {

			};



			trips {

				cpu-crit {

					temperature = <120000>;
@@ -1913,9 +1918,6 @@ 
					type = "critical";

				};

			};



			cooling-maps {

			};

		};

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -3112,7 +3112,7 @@ 
				 <&cpg CPG_MOD 722>,

				 <&cpg CPG_MOD 721>;

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

			vsps = <&vspd0 0 &vspd1 0 &vspd2 0 &vspd0 1>;

			vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>, <&vspd0 1>;

			status = "disabled";



			ports {