arm64: dts: renesas: salvator-common: use audio-graph-card for Sound (06a574c7) · Commits · 戴 / test

Current Sound is using simple-audio-card which can't support HDMI. To use HDMI sound, we need to use audio-graph-card. But, one note is that r8a7795 has 2 HDMI ports, but r8a7796 has 1. Because of this mismatch, supporting HDMI on salvator-common is impossible. Thus, this patch exchange sound card to audio-graph-card and keep supporting ak4613 as 1st sound node. r8a7795/r8a7796 salvator-x{s} need to add HDMI sound individually. Signed-off-by:

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Tested-by:

Nguyen Viet Dung <nv-dung@jinso.co.jp> Signed-off-by:

Simon Horman <horms+renesas@verge.net.au>

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

+22 −16

Original line number	Diff line number	Diff line
		@@ -93,20 +93,12 @@
		regulator-always-on;
		};

		rsnd_ak4613: sound {
		compatible = "simple-audio-card";
		sound_card: sound {
		compatible = "audio-graph-card";

		simple-audio-card,format = "left_j";
		simple-audio-card,bitclock-master = <&sndcpu>;
		simple-audio-card,frame-master = <&sndcpu>;
		label = "rcar-sound";

		sndcpu: simple-audio-card,cpu {
		sound-dai = <&rcar_sound>;
		};

		sndcodec: simple-audio-card,codec {
		sound-dai = <&ak4613>;
		};
		dais = <&rsnd_port0>;
		};

		vbus0_usb2: regulator-vbus0-usb2 {
		@@ -322,6 +314,12 @@
		asahi-kasei,out4-single-end;
		asahi-kasei,out5-single-end;
		asahi-kasei,out6-single-end;

		port {
		ak4613_endpoint: endpoint {
		remote-endpoint = <&rsnd_endpoint0>;
		};
		};
		};

		cs2000: clk_multiplier@4f {
		@@ -581,13 +579,21 @@
		<&audio_clk_c>,
		<&cpg CPG_CORE CPG_AUDIO_CLK_I>;

		rcar_sound,dai {
		dai0 {
		ports {
		rsnd_port0: port@0 {
		rsnd_endpoint0: endpoint {
		remote-endpoint = <&ak4613_endpoint>;

		dai-format = "left_j";
		bitclock-master = <&rsnd_endpoint0>;
		frame-master = <&rsnd_endpoint0>;

		playback = <&ssi0 &src0 &dvc0>;
		capture = <&ssi1 &src1 &dvc1>;
		};
		};
		};
		};

		&scif1 {
		pinctrl-0 = <&scif1_pins>;

Admin message