Commit 8fbb8c33 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

arm64: dts: renesas: salvator-x(s): Factor out HDMI1 parts 



Move the common parts related to the second HDMI interface on
Salvator-X(S) boards to salvator-common.dtsi, to reduce current and
avoid future duplication of board descriptions.

As this interface is not present on all SoCs that can be found on
Salvator-X(S), but only on R-Car H3, its description are protected by
the preprocessor symbol SOC_HAS_HDMI1, defined in r8a77951.dtsi.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://lore.kernel.org/r/a1d9dcd481d36e5b6e78934e587f6391022030b5.1623087028.git.geert+renesas@glider.be
parent 2734d6c1

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

+0 −47
Original line number Diff line number Diff line
@@ -52,29 +52,6 @@ 
	status = "okay";

};



&hdmi1 {

	status = "okay";



	ports {

		port@1 {

			reg = <1>;

			rcar_dw_hdmi1_out: endpoint {

				remote-endpoint = <&hdmi1_con>;

			};

		};

		port@2 {

			reg = <2>;

			dw_hdmi1_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint2>;

			};

		};

	};

};



&hdmi1_con {

	remote-endpoint = <&rcar_dw_hdmi1_out>;

};



&ohci2 {

	status = "okay";

};
@@ -86,34 +63,10 @@ 
	};

};



&rcar_sound {

	ports {

		/* rsnd_port0/1 are described in salvator-common.dtsi */

		rsnd_port2: port@2 {

			reg = <2>;

			rsnd_endpoint2: endpoint {

				remote-endpoint = <&dw_hdmi1_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint2>;

				frame-master = <&rsnd_endpoint2>;



				playback = <&ssi3>;

			};

		};

	};

};



&sata {

	status = "okay";

};



&sound_card {

	dais = <&rsnd_port0	/* ak4613 */

		&rsnd_port1	/* HDMI0  */

		&rsnd_port2>;	/* HDMI1  */

};



&usb2_phy2 {

	pinctrl-0 = <&usb2_pins>;

	pinctrl-names = "default";

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

+0 −47
Original line number Diff line number Diff line
@@ -52,29 +52,6 @@ 
	status = "okay";

};



&hdmi1 {

	status = "okay";



	ports {

		port@1 {

			reg = <1>;

			rcar_dw_hdmi1_out: endpoint {

				remote-endpoint = <&hdmi1_con>;

			};

		};

		port@2 {

			reg = <2>;

			dw_hdmi1_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint2>;

			};

		};

	};

};



&hdmi1_con {

	remote-endpoint = <&rcar_dw_hdmi1_out>;

};



&ohci2 {

	status = "okay";

};
@@ -86,34 +63,10 @@ 
	};

};



&rcar_sound {

	ports {

		/* rsnd_port0/1 are described in salvator-common.dtsi */

		rsnd_port2: port@2 {

			reg = <2>;

			rsnd_endpoint2: endpoint {

				remote-endpoint = <&dw_hdmi1_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint2>;

				frame-master = <&rsnd_endpoint2>;



				playback = <&ssi3>;

			};

		};

	};

};



&sata {

	status = "okay";

};



&sound_card {

	dais = <&rsnd_port0	/* ak4613 */

		&rsnd_port1	/* HDMI0  */

		&rsnd_port2>;	/* HDMI1  */

};



&usb2_phy2 {

	pinctrl-0 = <&usb2_pins>;

	pinctrl-names = "default";

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

+0 −47
Original line number Diff line number Diff line
@@ -57,29 +57,6 @@ 
	status = "okay";

};



&hdmi1 {

	status = "okay";



	ports {

		port@1 {

			reg = <1>;

			rcar_dw_hdmi1_out: endpoint {

				remote-endpoint = <&hdmi1_con>;

			};

		};

		port@2 {

			reg = <2>;

			dw_hdmi1_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint2>;

			};

		};

	};

};



&hdmi1_con {

	remote-endpoint = <&rcar_dw_hdmi1_out>;

};



&hsusb3 {

	dr_mode = "otg";

	status = "okay";
@@ -127,35 +104,11 @@ 
	};

};



&rcar_sound {

	ports {

		/* rsnd_port0/1 are described in salvator-common.dtsi */

		rsnd_port2: port@2 {

			reg = <2>;

			rsnd_endpoint2: endpoint {

				remote-endpoint = <&dw_hdmi1_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint2>;

				frame-master = <&rsnd_endpoint2>;



				playback = <&ssi3>;

			};

		};

	};

};



/* SW12-7 must be set 'Off' (MD12 set to 1) which is not the default! */

&sata {

	status = "okay";

};



&sound_card {

	dais = <&rsnd_port0	/* ak4613 */

		&rsnd_port1	/* HDMI0  */

		&rsnd_port2>;	/* HDMI1  */

};



&usb2_phy2 {

	pinctrl-0 = <&usb2_pins>;

	pinctrl-names = "default";

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

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 


#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4



#define SOC_HAS_HDMI1



/ {

	compatible = "renesas,r8a7795";

	#address-cells = <2>;

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

+45 −1
Original line number Diff line number Diff line
@@ -202,7 +202,11 @@ 
		label = "rcar-sound";



		dais = <&rsnd_port0	/* ak4613 */

			&rsnd_port1>;	/* HDMI0  */

			&rsnd_port1	/* HDMI0  */

#ifdef SOC_HAS_HDMI1

			&rsnd_port2	/* HDMI1  */

#endif

			>;

	};



	vbus0_usb2: regulator-vbus0-usb2 {
@@ -422,6 +426,31 @@ 
	remote-endpoint = <&rcar_dw_hdmi0_out>;

};



#ifdef SOC_HAS_HDMI1

&hdmi1 {

	status = "okay";



	ports {

		port@1 {

			reg = <1>;

			rcar_dw_hdmi1_out: endpoint {

				remote-endpoint = <&hdmi1_con>;

			};

		};

		port@2 {

			reg = <2>;

			dw_hdmi1_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint2>;

			};

		};

	};

};



&hdmi1_con {

	remote-endpoint = <&rcar_dw_hdmi1_out>;

};

#endif /* SOC_HAS_HDMI1 */



&hscif1 {

	pinctrl-0 = <&hscif1_pins>;

	pinctrl-names = "default";
@@ -818,6 +847,21 @@ 
				playback = <&ssi2>;

			};

		};



#ifdef SOC_HAS_HDMI1

		rsnd_port2: port@2 {

			reg = <2>;

			rsnd_endpoint2: endpoint {

				remote-endpoint = <&dw_hdmi1_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint2>;

				frame-master = <&rsnd_endpoint2>;



				playback = <&ssi3>;

			};

		};

#endif /* SOC_HAS_HDMI1 */

	};

};