Commit 06a574c7 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Simon Horman

arm64: dts: renesas: salvator-common: use audio-graph-card for Sound

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarNguyen Viet Dung <nv-dung@jinso.co.jp>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent c39f0987
...@@ -93,20 +93,12 @@ reg_12v: regulator2 { ...@@ -93,20 +93,12 @@ reg_12v: regulator2 {
regulator-always-on; regulator-always-on;
}; };
rsnd_ak4613: sound { sound_card: sound {
compatible = "simple-audio-card"; compatible = "audio-graph-card";
simple-audio-card,format = "left_j"; label = "rcar-sound";
simple-audio-card,bitclock-master = <&sndcpu>;
simple-audio-card,frame-master = <&sndcpu>;
sndcpu: simple-audio-card,cpu { dais = <&rsnd_port0>;
sound-dai = <&rcar_sound>;
};
sndcodec: simple-audio-card,codec {
sound-dai = <&ak4613>;
};
}; };
vbus0_usb2: regulator-vbus0-usb2 { vbus0_usb2: regulator-vbus0-usb2 {
...@@ -322,6 +314,12 @@ ak4613: codec@10 { ...@@ -322,6 +314,12 @@ ak4613: codec@10 {
asahi-kasei,out4-single-end; asahi-kasei,out4-single-end;
asahi-kasei,out5-single-end; asahi-kasei,out5-single-end;
asahi-kasei,out6-single-end; asahi-kasei,out6-single-end;
port {
ak4613_endpoint: endpoint {
remote-endpoint = <&rsnd_endpoint0>;
};
};
}; };
cs2000: clk_multiplier@4f { cs2000: clk_multiplier@4f {
...@@ -581,10 +579,18 @@ &rcar_sound { ...@@ -581,10 +579,18 @@ &rcar_sound {
<&audio_clk_c>, <&audio_clk_c>,
<&cpg CPG_CORE CPG_AUDIO_CLK_I>; <&cpg CPG_CORE CPG_AUDIO_CLK_I>;
rcar_sound,dai { ports {
dai0 { rsnd_port0: port@0 {
playback = <&ssi0 &src0 &dvc0>; rsnd_endpoint0: endpoint {
capture = <&ssi1 &src1 &dvc1>; remote-endpoint = <&ak4613_endpoint>;
dai-format = "left_j";
bitclock-master = <&rsnd_endpoint0>;
frame-master = <&rsnd_endpoint0>;
playback = <&ssi0 &src0 &dvc0>;
capture = <&ssi1 &src1 &dvc1>;
};
}; };
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment