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

Commit 9cbcb077 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-arm64-dt2-for-v4.11' of... 

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

Second Round of Renesas ARM64 Based SoC DT Updates for v4.11

r8a779[56] SoCs:
* Mark EthernetAVB device node disabled in DT for r8a779[56] SoCs
  - They are enabled as appropriate in board DT files
* Link ARM GIC to clock and clock domain on r8a779[56] SoCs
* Add thermal support

r8a7795 SoC:
* Tidyup audma definition order on r8a7795 SoC
* Add missing power-domains property for SATA

r8a7795/h3ulcb board:
* Add MIX/CTU support as per support present in DT for r8a7796

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

:
  arm64: dts: r8a7796: Mark EthernetAVB device node disabled
  arm64: dts: r8a7795: Mark EthernetAVB device node disabled
  arm64: dts: r8a7795: tidyup audma definition order
  arm64: dts: r8a7796: Link ARM GIC to clock and clock domain
  arm64: dts: r8a7795: Link ARM GIC to clock and clock domain
  arm64: dts: r8a7796: Add R-Car Gen3 thermal support
  arm64: dts: r8a7795: Add R-Car Gen3 thermal support
  arm64: dts: r8a7795: Add missing power-domains property for sata
  arm64: dts: h3ulcb: follow sound CTU/MIX supports

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 656b532f 7e1c23b9

arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts

+2 −0
Original line number Diff line number Diff line
@@ -277,6 +277,8 @@ 
		 <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,

		 <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,

		 <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,

		 <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,

		 <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,

		 <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,

		 <&audio_clk_a>, <&cs2000>,

		 <&audio_clk_c>,

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

+129 −66
Original line number Diff line number Diff line
@@ -166,6 +166,9 @@ 
			      <0x0 0xf1060000 0 0x20000>;

			interrupts = <GIC_PPI 9

					(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;

			clocks = <&cpg CPG_MOD 408>;

			clock-names = "clk";

			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;

		};



		wdt0: watchdog@e6020000 {
@@ -337,72 +340,6 @@ 
			#power-domain-cells = <1>;

		};



		audma0: dma-controller@ec700000 {

			compatible = "renesas,dmac-r8a7795",

				     "renesas,rcar-dmac";

			reg = <0 0xec700000 0 0x10000>;

			interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "error",

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

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

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

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

			clocks = <&cpg CPG_MOD 502>;

			clock-names = "fck";

			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;

			#dma-cells = <1>;

			dma-channels = <16>;

		};



		audma1: dma-controller@ec720000 {

			compatible = "renesas,dmac-r8a7795",

				     "renesas,rcar-dmac";

			reg = <0 0xec720000 0 0x10000>;

			interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "error",

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

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

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

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

			clocks = <&cpg CPG_MOD 501>;

			clock-names = "fck";

			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;

			#dma-cells = <1>;

			dma-channels = <16>;

		};



		pfc: pfc@e6060000 {

			compatible = "renesas,pfc-r8a7795";

			reg = <0 0xe6060000 0 0x50c>;
@@ -522,6 +459,72 @@ 
			dma-channels = <16>;

		};



		audma0: dma-controller@ec700000 {

			compatible = "renesas,dmac-r8a7795",

				     "renesas,rcar-dmac";

			reg = <0 0xec700000 0 0x10000>;

			interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "error",

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

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

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

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

			clocks = <&cpg CPG_MOD 502>;

			clock-names = "fck";

			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;

			#dma-cells = <1>;

			dma-channels = <16>;

		};



		audma1: dma-controller@ec720000 {

			compatible = "renesas,dmac-r8a7795",

				     "renesas,rcar-dmac";

			reg = <0 0xec720000 0 0x10000>;

			interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "error",

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

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

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

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

			clocks = <&cpg CPG_MOD 501>;

			clock-names = "fck";

			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;

			#dma-cells = <1>;

			dma-channels = <16>;

		};



		avb: ethernet@e6800000 {

			compatible = "renesas,etheravb-r8a7795",

				     "renesas,etheravb-rcar-gen3";
@@ -563,6 +566,7 @@ 
			phy-mode = "rgmii-id";

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		can0: can@e6c30000 {
@@ -1148,6 +1152,7 @@ 
			reg = <0 0xee300000 0 0x1fff>;

			interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 815>;

			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;

			status = "disabled";

		};
@@ -1646,5 +1651,63 @@ 
				};

			};

		};



		tsc: thermal@e6198000 {

			compatible = "renesas,r8a7795-thermal";

			reg = <0 0xe6198000 0 0x68>,

			      <0 0xe61a0000 0 0x5c>,

			      <0 0xe61a8000 0 0x5c>;

			interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 522>;

			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;

			#thermal-sensor-cells = <1>;

			status = "okay";

		};



		thermal-zones {

			sensor_thermal1: sensor-thermal1 {

				polling-delay-passive = <250>;

				polling-delay = <1000>;

				thermal-sensors = <&tsc 0>;



				trips {

					sensor1_crit: sensor1-crit {

						temperature = <120000>;

						hysteresis = <2000>;

						type = "critical";

					};

				};

			};



			sensor_thermal2: sensor-thermal2 {

				polling-delay-passive = <250>;

				polling-delay = <1000>;

				thermal-sensors = <&tsc 1>;



				trips {

					sensor2_crit: sensor2-crit {

						temperature = <120000>;

						hysteresis = <2000>;

						type = "critical";

					};

				};

			};



			sensor_thermal3: sensor-thermal3 {

				polling-delay-passive = <250>;

				polling-delay = <1000>;

				thermal-sensors = <&tsc 2>;



				trips {

					sensor3_crit: sensor3-crit {

						temperature = <120000>;

						hysteresis = <2000>;

						type = "critical";

					};

				};

			};

		};

	};

};

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

+62 −0
Original line number Diff line number Diff line
@@ -101,6 +101,9 @@ 
			      <0x0 0xf1060000 0 0x20000>;

			interrupts = <GIC_PPI 9

					(GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)>;

			clocks = <&cpg CPG_MOD 408>;

			clock-names = "clk";

			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;

		};



		timer {
@@ -469,6 +472,7 @@ 
			phy-mode = "rgmii-id";

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		scif2: serial@e6e88000 {
@@ -680,5 +684,63 @@ 
			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;

			status = "disabled";

		};



		tsc: thermal@e6198000 {

			compatible = "renesas,r8a7796-thermal";

			reg = <0 0xe6198000 0 0x68>,

			      <0 0xe61a0000 0 0x5c>,

			      <0 0xe61a8000 0 0x5c>;

			interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 522>;

			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;

			#thermal-sensor-cells = <1>;

			status = "okay";

		};



		thermal-zones {

			sensor_thermal1: sensor-thermal1 {

				polling-delay-passive = <250>;

				polling-delay = <1000>;

				thermal-sensors = <&tsc 0>;



				trips {

					sensor1_crit: sensor1-crit {

						temperature = <120000>;

						hysteresis = <2000>;

						type = "critical";

					};

				};

			};



			sensor_thermal2: sensor-thermal2 {

				polling-delay-passive = <250>;

				polling-delay = <1000>;

				thermal-sensors = <&tsc 1>;



				trips {

					sensor2_crit: sensor2-crit {

						temperature = <120000>;

						hysteresis = <2000>;

						type = "critical";

					};

				};

			};



			sensor_thermal3: sensor-thermal3 {

				polling-delay-passive = <250>;

				polling-delay = <1000>;

				thermal-sensors = <&tsc 2>;



				trips {

					sensor3_crit: sensor3-crit {

						temperature = <120000>;

						hysteresis = <2000>;

						type = "critical";

					};

				};

			};

		};

	};

};