diff options
| author | Yusuke Goda <yusuke.goda.sx@renesas.com> | 2018-11-06 09:46:27 +0000 |
|---|---|---|
| committer | Ryo Kataoka <ryo.kataoka.wt@renesas.com> | 2018-12-07 19:57:03 +0900 |
| commit | 297d2f8b13f52699e19388743a402bef3745a426 (patch) | |
| tree | 962d863b72a2071fe1b0b72e6d9acc5b99979f8c | |
| parent | 6092e813c0be65afb59776e026fb79ae6b6e806e (diff) | |
| download | renesas-bsp-297d2f8b13f52699e19388743a402bef3745a426.tar.gz | |
arm64: dts: ulcb: Change to use "audio-graph-card"
The default setting of Salvator board is "audio-graph-card".
So, this patch changes from "simple-audio-card" to "audio-graph-card".
Signed-off-by: Yusuke Goda <yusuke.goda.sx@renesas.com>
| -rw-r--r-- | arch/arm64/boot/dts/renesas/ulcb.dtsi | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi index 66e399d973196..94d58a8da31f1 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -94,20 +94,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>; }; vcc_sdhi0: regulator-vcc-sdhi0 { @@ -226,6 +218,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 { @@ -405,10 +403,21 @@ <&audio_clk_c>, <&cpg CPG_CORE CPG_AUDIO_CLK_I>; - rcar_sound,dai { - dai0 { - playback = <&ssi0 &src0 &dvc0>; - capture = <&ssi1 &src1 &dvc1>; + ports { + #address-cells = <1>; + #size-cells = <0>; + rsnd_port0: port@0 { + reg = <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>; + }; }; }; }; |