Commit b1158c5e authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

arm64: dts: renesas: Consolidate Salvator-X(S) HDMI0 handling 



Now all Salvator-X(S) SoC/board combinations have support for HDMI
sound, all HDMI0 connector and sound descriptions are identical.
Replace them by shared descriptions in salvator-common.dtsi, to reduce
duplication.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/20210303140529.3941670-1-geert+renesas@glider.be
parent d765a4f3

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

+1 −36
Original line number Diff line number Diff line
@@ -52,29 +52,6 @@ &ehci2 { 
	status = "okay";

};



&hdmi0 {

	status = "okay";



	ports {

		port@1 {

			reg = <1>;

			rcar_dw_hdmi0_out: endpoint {

				remote-endpoint = <&hdmi0_con>;

			};

		};

		port@2 {

			reg = <2>;

			dw_hdmi0_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint1>;

			};

		};

	};

};



&hdmi0_con {

	remote-endpoint = <&rcar_dw_hdmi0_out>;

};



&hdmi1 {

	status = "okay";
@@ -111,19 +88,7 @@ usb2_pins: usb2 { 


&rcar_sound {

	ports {

		/* rsnd_port0 is on salvator-common */

		rsnd_port1: port@1 {

			reg = <1>;

			rsnd_endpoint1: endpoint {

				remote-endpoint = <&dw_hdmi0_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint1>;

				frame-master = <&rsnd_endpoint1>;



				playback = <&ssi2>;

			};

		};

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

		rsnd_port2: port@2 {

			reg = <2>;

			rsnd_endpoint2: endpoint {

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

+1 −36
Original line number Diff line number Diff line
@@ -52,29 +52,6 @@ &ehci2 { 
	status = "okay";

};



&hdmi0 {

	status = "okay";



	ports {

		port@1 {

			reg = <1>;

			rcar_dw_hdmi0_out: endpoint {

				remote-endpoint = <&hdmi0_con>;

			};

		};

		port@2 {

			reg = <2>;

			dw_hdmi0_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint1>;

			};

		};

	};

};



&hdmi0_con {

	remote-endpoint = <&rcar_dw_hdmi0_out>;

};



&hdmi1 {

	status = "okay";
@@ -111,19 +88,7 @@ usb2_pins: usb2 { 


&rcar_sound {

	ports {

		/* rsnd_port0 is on salvator-common */

		rsnd_port1: port@1 {

			reg = <1>;

			rsnd_endpoint1: endpoint {

				remote-endpoint = <&dw_hdmi0_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint1>;

				frame-master = <&rsnd_endpoint1>;



				playback = <&ssi2>;

			};

		};

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

		rsnd_port2: port@2 {

			reg = <2>;

			rsnd_endpoint2: endpoint {

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

+1 −36
Original line number Diff line number Diff line
@@ -57,29 +57,6 @@ &ehci3 { 
	status = "okay";

};



&hdmi0 {

	status = "okay";



	ports {

		port@1 {

			reg = <1>;

			rcar_dw_hdmi0_out: endpoint {

				remote-endpoint = <&hdmi0_con>;

			};

		};

		port@2 {

			reg = <2>;

			dw_hdmi0_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint1>;

			};

		};

	};

};



&hdmi0_con {

	remote-endpoint = <&rcar_dw_hdmi0_out>;

};



&hdmi1 {

	status = "okay";
@@ -152,19 +129,7 @@ usb2_ch3_pins: usb2_ch3 { 


&rcar_sound {

	ports {

		/* rsnd_port0 is on salvator-common */

		rsnd_port1: port@1 {

			reg = <1>;

			rsnd_endpoint1: endpoint {

				remote-endpoint = <&dw_hdmi0_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint1>;

				frame-master = <&rsnd_endpoint1>;



				playback = <&ssi2>;

			};

		};

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

		rsnd_port2: port@2 {

			reg = <2>;

			rsnd_endpoint2: endpoint {

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

+0 −46
Original line number Diff line number Diff line
@@ -35,49 +35,3 @@ &du { 
	clock-names = "du.0", "du.1", "du.2",

		      "dclkin.0", "dclkin.1", "dclkin.2";

};
 


&hdmi0 {

	status = "okay";



	ports {

		port@1 {

			reg = <1>;

			rcar_dw_hdmi0_out: endpoint {

				remote-endpoint = <&hdmi0_con>;

			};

		};

		port@2 {

			reg = <2>;

			dw_hdmi0_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint1>;

			};

		};

	};

};



&hdmi0_con {

	remote-endpoint = <&rcar_dw_hdmi0_out>;

};



&rcar_sound {

	ports {

		/* rsnd_port0 is on salvator-common */

		rsnd_port1: port@1 {

			reg = <1>;

			rsnd_endpoint1: endpoint {

				remote-endpoint = <&dw_hdmi0_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint1>;

				frame-master = <&rsnd_endpoint1>;



				playback = <&ssi2>;

			};

		};

	};

};



&sound_card {

	dais = <&rsnd_port0	/* ak4613 */

		&rsnd_port1>;	/* HDMI0  */

};

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

+0 −46
Original line number Diff line number Diff line
@@ -35,49 +35,3 @@ &du { 
	clock-names = "du.0", "du.1", "du.2",

		      "dclkin.0", "dclkin.1", "dclkin.2";

};
 


&hdmi0 {

	status = "okay";



	ports {

		port@1 {

			reg = <1>;

			rcar_dw_hdmi0_out: endpoint {

				remote-endpoint = <&hdmi0_con>;

			};

		};

		port@2 {

			reg = <2>;

			dw_hdmi0_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint1>;

			};

		};

	};

};



&hdmi0_con {

	remote-endpoint = <&rcar_dw_hdmi0_out>;

};



&rcar_sound {

	ports {

		/* rsnd_port0 is on salvator-common */

		rsnd_port1: port@1 {

			reg = <1>;

			rsnd_endpoint1: endpoint {

				remote-endpoint = <&dw_hdmi0_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint1>;

				frame-master = <&rsnd_endpoint1>;



				playback = <&ssi2>;

			};

		};

	};

};



&sound_card {

	dais = <&rsnd_port0	/* ak4613 */

		&rsnd_port1>;	/* HDMI0  */

};