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

Commit 171d429a authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Renesas ARM64 Based SoC DT Updates for v4.18

* Cleanups:
  - Correct whitespace
  - sort subnodes of the root and soc nodes
* R-Car M3-N (r8a77965) SoC
  - Describe MSIOF SPI, PWM, SDHI and I2C devices in DT
  - Add thermal support
* R-Car H3 (r8a7795) and R-Car M3-W (r8a7796) SoCs
  - Decrease temperature hysteresis
* R-Car H3 (r8a7795), M3-W (r8a7796) and M3-N (r8a77965) SoCs
  - Add address properties to rcar_sound port nodes
* R-Car H3 (r8a7795), M3-W (r8a7796) V3M (r8a77970) and D3 (r8a77995) SoCs
  - Enable IPMMU devices
* R-Car M3-N (r8a77965) and V3H (r8a77980) SoCs
  - Use sysc binding macros
  - Describe USB2 and USB3 devices in DT
* R-Car V3M (r8a77970) SoC
  - Add SMP Support
  - Correct IPMMU DS1 bit number
* R-Car V3H (r8a77980) SoC
  - Use CPG clock binding macros
* R-Car V3H (r8a77980) and V3M (r8a77970) SoCs
  - Disable EtherAVB
* R-Car D3 (r8a77995) SoC
  - Describe VIN4 in DT

* Ebisu board with R-Car E3 (r8a77990) SoC
  - Initial support
* Salvator-XS boards with R-Car H3 (r8a7795) SoC
  - Enable USB2.0 channel 3
* Salvator-X and Salvator-XS boards with M3-N (r8a77965) SoC
  - Enable DU
* Salvator-X and Salvator-XS boards with
  R-Car H3 (r8a7795), M3-W (r8a7796) and M3-N (r8a77965) SoCs
  - Enable nable VIN, CSI-2 and ADV7482
  - Add PMIC DDR Backup Power config
  - Add EEPROM
  - Enable HDMI Sound
* Salvator-X and Salvator-XS boards with
  R-Car H3 (r8a7795), M3-W (r8a7796) and M3-N (r8a77965) SoCs, and
  Draak board with R-Car D3 (r8a77995) SoC
  - Consistently name EtherAVB mdio pin group
* Ebisu board with R-Car E3 (r8a77990) SoC
  - Initial support: Memory, Main crystal, Serial console
  - Enable Ethernet
  - Revise PSCI node
  - Revise cache controller node
* V3HSK board with R-Car V3H (r8a77980) SoC
  - Initial board device tree
  - Enable PFC support and use for EtherAVB
* V3MSK board with R-Car V3M (r8a77970) SoC
  - Add DU/LVDS/HDMI support
  - Enable PFC for EtherAVB
* Condor board with R-Car V3H (r8a77980) SoC
  - Enable eMMC
  - Enable PFC support and use for EtherAVB and SCIF0
* Eagle board with R-Car V3M (r8a77970) SoC
  - Enable HDMI output
* Eagle board with R-Car V3M (r8a77970) SoC and
  Condor board with R-Car V3H (r8a77980) SoC
  - Enable CAN-FD

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

: (102 commits)
  arm64: dts: renesas: salvator-common: Add ADV7482 support
  arm64: dts: renesas: salvator-common: enable VIN
  arm64: dts: renesas: r8a77970: add VIN and CSI-2 nodes
  arm64: dts: renesas: r8a77965: add VIN and CSI-2 nodes
  arm64: dts: renesas: r8a7796: add VIN and CSI-2 nodes
  arm64: dts: renesas: r8a7795-es1: add CSI-2 node
  arm64: dts: renesas: r8a7795: add VIN and CSI-2 nodes
  arm64: dts: renesas: r8a77965: add I2C support
  arm64: dts: renesas: r8a77990: ebisu: Enable EthernetAVB
  arm64: dts: renesas: r8a77990: Add EthernetAVB device nodes
  arm64: dts: renesas: r8a77990: Add GPIO device nodes
  arm64: dts: renesas: r8a77990: Add PFC device node
  arm64: dts: renesas: initial V3HSK board device tree
  arm64: dts: renesas: r8a77980: disable EtherAVB
  arm64: dts: renesas: r8a77970: disable EtherAVB
  arm64: dts: renesas: r8a77995: Add VIN4
  arm64: dts: renesas: r8a77980: add resets property to CAN-FD node
  arm64: dts: renesas: r8a77970: Add Cortex-A53 PMU node
  arm64: dts: renesas: r8a77970: Add secondary CA53 CPU core
  arm64: dts: renesas: r8a77965: Add SDHI device nodes
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ae709bf8 908001d7

arch/arm64/Kconfig.platforms

+6 −0
Original line number Diff line number Diff line
@@ -208,6 +208,12 @@ config ARCH_R8A77980 
	help

	  This enables support for the Renesas R-Car V3H SoC.



config ARCH_R8A77990

	bool "Renesas R-Car E3 SoC Platform"

	depends on ARCH_RENESAS

	help

	  This enables support for the Renesas R-Car E3 SoC.



config ARCH_R8A77995

	bool "Renesas R-Car D3 SoC Platform"

	depends on ARCH_RENESAS

arch/arm64/boot/dts/renesas/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -9,5 +9,6 @@ dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-m3ulcb-kf.dtb 
dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-xs.dtb

dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-x.dtb r8a77965-salvator-xs.dtb

dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb r8a77970-v3msk.dtb

dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-condor.dtb

dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-condor.dtb r8a77980-v3hsk.dtb

dtb-$(CONFIG_ARCH_R8A77990) += r8a77990-ebisu.dtb

dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb

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

+46 −0
Original line number Diff line number Diff line
@@ -56,6 +56,12 @@ 
	status = "okay";

};



&sound_card {

	dais = <&rsnd_port0	/* ak4613 */

		&rsnd_port1	/* HDMI0  */

		&rsnd_port2>;	/* HDMI1  */

};



&hdmi0 {

	status = "okay";
@@ -66,6 +72,12 @@ 
				remote-endpoint = <&hdmi0_con>;

			};

		};

		port@2 {

			reg = <2>;

			dw_hdmi0_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint1>;

			};

		};

	};

};
@@ -83,6 +95,12 @@ 
				remote-endpoint = <&hdmi1_con>;

			};

		};

		port@2 {

			reg = <2>;

			dw_hdmi1_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint2>;

			};

		};

	};

};
@@ -94,6 +112,34 @@ 
	status = "okay";

};



&rcar_sound {

	ports {

		/* rsnd_port0 is on salvator-common */

		rsnd_port1: port@1 {

			rsnd_endpoint1: endpoint {

				remote-endpoint = <&dw_hdmi0_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint1>;

				frame-master = <&rsnd_endpoint1>;



				playback = <&ssi2>;

			};

		};

		rsnd_port2: port@2 {

			rsnd_endpoint2: endpoint {

				remote-endpoint = <&dw_hdmi1_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint2>;

				frame-master = <&rsnd_endpoint2>;



				playback = <&ssi3>;

			};

		};

	};

};



&pfc {

	usb2_pins: usb2 {

		groups = "usb2";

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

+143 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
		reg = <0 0xe7730000 0 0x1000>;

		renesas,ipmmu-main = <&ipmmu_mm 8>;

		#iommu-cells = <1>;

		status = "disabled";

	};



	/delete-node/ usb-phy@ee0e0200;
@@ -108,6 +107,61 @@ 
		resets = <&cpg 117>;

		renesas,fcp = <&fcpf2>;

	};



	csi21: csi2@fea90000 {

		compatible = "renesas,r8a7795-csi2";

		reg = <0 0xfea90000 0 0x10000>;

		interrupts = <GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cpg CPG_MOD 713>;

		power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;

		resets = <&cpg 713>;

		status = "disabled";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@1 {

				#address-cells = <1>;

				#size-cells = <0>;



				reg = <1>;



				csi21vin0: endpoint@0 {

					reg = <0>;

					remote-endpoint = <&vin0csi21>;

				};

				csi21vin1: endpoint@1 {

					reg = <1>;

					remote-endpoint = <&vin1csi21>;

				};

				csi21vin2: endpoint@2 {

					reg = <2>;

					remote-endpoint = <&vin2csi21>;

				};

				csi21vin3: endpoint@3 {

					reg = <3>;

					remote-endpoint = <&vin3csi21>;

				};

				csi21vin4: endpoint@4 {

					reg = <4>;

					remote-endpoint = <&vin4csi21>;

				};

				csi21vin5: endpoint@5 {

					reg = <5>;

					remote-endpoint = <&vin5csi21>;

				};

				csi21vin6: endpoint@6 {

					reg = <6>;

					remote-endpoint = <&vin6csi21>;

				};

				csi21vin7: endpoint@7 {

					reg = <7>;

					remote-endpoint = <&vin7csi21>;

				};

			};

		};

	};

};



&gpio1 {
@@ -175,3 +229,91 @@ 
&du {

	vsps = <&vspd0 &vspd1 &vspd2 &vspd3>;

};



&vin0 {

	ports {

		port@1 {

			vin0csi21: endpoint@1 {

				reg = <1>;

				remote-endpoint= <&csi21vin0>;

			};

		};

	};

};



&vin1 {

	ports {

		port@1 {

			vin1csi21: endpoint@1 {

				reg = <1>;

				remote-endpoint= <&csi21vin1>;

			};

		};

	};

};



&vin2 {

	ports {

		port@1 {

			vin2csi21: endpoint@1 {

				reg = <1>;

				remote-endpoint= <&csi21vin2>;

			};

		};

	};

};



&vin3 {

	ports {

		port@1 {

			vin3csi21: endpoint@1 {

				reg = <1>;

				remote-endpoint= <&csi21vin3>;

			};

		};

	};

};



&vin4 {

	ports {

		port@1 {

			vin4csi21: endpoint@1 {

				reg = <1>;

				remote-endpoint= <&csi21vin4>;

			};

		};

	};

};



&vin5 {

	ports {

		port@1 {

			vin5csi21: endpoint@1 {

				reg = <1>;

				remote-endpoint= <&csi21vin5>;

			};

		};

	};

};



&vin6 {

	ports {

		port@1 {

			vin6csi21: endpoint@1 {

				reg = <1>;

				remote-endpoint= <&csi21vin6>;

			};

		};

	};

};



&vin7 {

	ports {

		port@1 {

			vin7csi21: endpoint@1 {

				reg = <1>;

				remote-endpoint= <&csi21vin7>;

			};

		};

	};

};

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

+46 −0
Original line number Diff line number Diff line
@@ -56,6 +56,12 @@ 
	status = "okay";

};



&sound_card {

	dais = <&rsnd_port0	/* ak4613 */

		&rsnd_port1	/* HDMI0  */

		&rsnd_port2>;	/* HDMI1  */

};



&hdmi0 {

	status = "okay";
@@ -66,6 +72,12 @@ 
				remote-endpoint = <&hdmi0_con>;

			};

		};

		port@2 {

			reg = <2>;

			dw_hdmi0_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint1>;

			};

		};

	};

};
@@ -83,6 +95,12 @@ 
				remote-endpoint = <&hdmi1_con>;

			};

		};

		port@2 {

			reg = <2>;

			dw_hdmi1_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint2>;

			};

		};

	};

};
@@ -94,6 +112,34 @@ 
	status = "okay";

};



&rcar_sound {

	ports {

		/* rsnd_port0 is on salvator-common */

		rsnd_port1: port@1 {

			rsnd_endpoint1: endpoint {

				remote-endpoint = <&dw_hdmi0_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint1>;

				frame-master = <&rsnd_endpoint1>;



				playback = <&ssi2>;

			};

		};

		rsnd_port2: port@2 {

			rsnd_endpoint2: endpoint {

				remote-endpoint = <&dw_hdmi1_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint2>;

				frame-master = <&rsnd_endpoint2>;



				playback = <&ssi3>;

			};

		};

	};

};



&pfc {

	usb2_pins: usb2 {

		groups = "usb2";