From cda5747801eadd0f29a591bee4b36c6f1ae30a54 Mon Sep 17 00:00:00 2001 From: Takeshi Kihara Date: Fri, 19 Oct 2018 11:48:30 +0900 Subject: [PATCH 1/6] arm64: dts: salvator-common: Rcar-Sound This Patch Adds Rcar_Sound Signed-off-by: Takeshi Kihara --- .../boot/dts/renesas/salvator-common.dtsi | 40 ++++++++----------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi index 3257143e43c1..6cda02800731 100644 --- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi +++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi @@ -125,15 +125,21 @@ regulator-boot-on; regulator-always-on; }; + rsnd_ak4613: sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "left_j"; + simple-audio-card,bitclock-master = <&sndcpu>; + simple-audio-card,frame-master = <&sndcpu>; + sndcpu: simple-audio-card,cpu { + sound-dai = <&rcar_sound>; + }; - sound_card: sound { - compatible = "audio-graph-card"; - - label = "rcar-sound"; - - dais = <&rsnd_port0>; + sndcodec: simple-audio-card,codec { + sound-dai = <&ak4613>; + }; }; + vbus0_usb2: regulator-vbus0-usb2 { compatible = "regulator-fixed"; @@ -454,12 +460,6 @@ 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 { @@ -795,18 +795,10 @@ <&audio_clk_c>, <&cpg CPG_CORE CPG_AUDIO_CLK_I>; - 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>; - }; + rcar_sound,dai { + dai0 { + playback = <&ssi0 &src0 &dvc0>; + capture = <&ssi1 &src1 &dvc1>; }; }; }; -- 2.19.0