From 91f75002f8358907e8332b777ebedd24bc2b907b Mon Sep 17 00:00:00 2001 From: hq_guohongtao5_tmp Date: Tue, 18 Sep 2018 14:42:35 +0800 Subject: [PATCH] [9610][EVB] arm64: dts: enabled speaker amp Change-Id: Idf4c6816e439b16e83ba9eb20d2042304896c266 Signed-off-by: Shinhyung Kang --- .../dts/exynos/exynos9609-robusta2_evb.dts | 53 +++++++++++++++++-- .../arm64/boot/dts/exynos/exynos9609-wing.dts | 47 +++++++++++++++- sound/soc/samsung/exynos9610_madera.c | 53 ++++++++++++++++++- 3 files changed, 145 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts index 12b861409010..47680c12f9e9 100755 --- a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts +++ b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts @@ -832,9 +832,9 @@ "ABOX SIFS0 Capture", "VINPUTCALL"; samsung,codec = <&abox &abox_uaif_0 &abox_uaif_1 &abox_uaif_2 - &abox_uaif_4 &abox_dsif &abox_spdy>; /*&cs35l41_left*/ + &abox_uaif_4 &abox_dsif &abox_spdy &cs35l41_left>; samsung,prefix = "ABOX", "ABOX", "ABOX", "ABOX", - "ABOX", "ABOX", "ABOX", "Left"; + "ABOX", "ABOX", "ABOX", "SPK"; samsung,aux = <&abox_effect &abox_bt>; rdma@0 { @@ -1070,7 +1070,6 @@ }; }; -#if 0 /*ToDo: enable speaker amp on EVB board*/ codec-left-amp@0 { format = "i2s"; @@ -1081,7 +1080,51 @@ sound-dai = <&cs35l41_left 0>; }; }; -#endif + + cpu-dsp-voice-control@0 { + cpu { + sound-dai = <&cs47l35 3>; + }; + codec { + sound-dai = <&dummy_audio_codec>; + }; + }; + + cpu-dsp-trace@0 { + cpu { + sound-dai = <&cs47l35 4>; + }; + codec { + sound-dai = <&dummy_audio_codec>; + }; + }; + + cpu-dsp2-text@0 { + cpu { + sound-dai = <&cs47l35 5>; + }; + codec { + sound-dai = <&dummy_audio_codec>; + }; + }; + + cpu-dsp3-text@0 { + cpu { + sound-dai = <&cs47l35 6>; + }; + codec { + sound-dai = <&dummy_audio_codec>; + }; + }; + + cpu-dsp1-text@0 { + cpu { + sound-dai = <&cs47l35 7>; + }; + codec { + sound-dai = <&dummy_audio_codec>; + }; + }; }; @@ -2092,7 +2135,7 @@ }; &spi_6 { - status = "disable"; + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&spi6_bus &spi6_cs_func>; /*cs-gpios = <&gpp2 3 0>;*/ diff --git a/arch/arm64/boot/dts/exynos/exynos9609-wing.dts b/arch/arm64/boot/dts/exynos/exynos9609-wing.dts index e48331bf5986..cbe0a00e412e 100755 --- a/arch/arm64/boot/dts/exynos/exynos9609-wing.dts +++ b/arch/arm64/boot/dts/exynos/exynos9609-wing.dts @@ -834,7 +834,7 @@ samsung,codec = <&abox &abox_uaif_0 &abox_uaif_1 &abox_uaif_2 &abox_uaif_4 &abox_dsif &abox_spdy &cs35l41_left>; samsung,prefix = "ABOX", "ABOX", "ABOX", "ABOX", - "ABOX", "ABOX", "ABOX", "Left"; + "ABOX", "ABOX", "ABOX", "SPK"; samsung,aux = <&abox_effect &abox_bt>; rdma@0 { @@ -1080,6 +1080,51 @@ sound-dai = <&cs35l41_left 0>; }; }; + + cpu-dsp-voice-control@0 { + cpu { + sound-dai = <&cs47l35 3>; + }; + codec { + sound-dai = <&dummy_audio_codec>; + }; + }; + + cpu-dsp-trace@0 { + cpu { + sound-dai = <&cs47l35 4>; + }; + codec { + sound-dai = <&dummy_audio_codec>; + }; + }; + + cpu-dsp2-text@0 { + cpu { + sound-dai = <&cs47l35 5>; + }; + codec { + sound-dai = <&dummy_audio_codec>; + }; + }; + + cpu-dsp3-text@0 { + cpu { + sound-dai = <&cs47l35 6>; + }; + codec { + sound-dai = <&dummy_audio_codec>; + }; + }; + + cpu-dsp1-text@0 { + cpu { + sound-dai = <&cs47l35 7>; + }; + codec { + sound-dai = <&dummy_audio_codec>; + }; + }; }; diff --git a/sound/soc/samsung/exynos9610_madera.c b/sound/soc/samsung/exynos9610_madera.c index 577148054aab..6585fc5387fa 100755 --- a/sound/soc/samsung/exynos9610_madera.c +++ b/sound/soc/samsung/exynos9610_madera.c @@ -1034,14 +1034,63 @@ static struct snd_soc_dai_link exynos9610_dai[] = { .dpcm_playback = 1, .dpcm_capture = 1, }, -#if 0 /*ToDo: enable speaker amp on EVB board*/ { .name = "codec-left-amp", .ignore_suspend = 1, .ignore_pmdown_time = 1, .params = madera_amp_params, }, -#endif + + { + .name = "cpu-dsp-voice-control", + .stream_name = "cpu-dsp-voice-control", + .cpu_dai_name = "cs47l35-cpu-voicectrl", + .platform_name = "cs47l35-codec", + .codec_dai_name = "cs47l35-dsp-voicectrl", + .codec_name = "cs47l35-codec", + .ignore_suspend = 1, + .dynamic = 0, + }, + { + .name = "cpu-dsp-trace", + .stream_name = "cpu-dsp-voice-trace", + .cpu_dai_name = "cs47l35-cpu-trace", + .platform_name = "cs47l35-codec", + .codec_dai_name = "cs47l35-dsp-trace", + .codec_name = "cs47l35-codec", + .ignore_suspend = 1, + .dynamic = 0, + }, + { + .name = "cpu-dsp2-text", + .stream_name = "cpu-dsp2-text", + .cpu_dai_name = "cs47l35-dsp2-cpu-txt", + .platform_name = "cs47l35-codec", + .codec_dai_name = "cs47l35-dsp2-txt", + .codec_name = "cs47l35-codec", + .ignore_suspend = 1, + .dynamic = 0, + }, + { + .name = "cpu-dsp3-text", + .stream_name = "cpu-dsp3-text", + .cpu_dai_name = "cs47l35-dsp3-cpu-txt", + .platform_name = "cs47l35-codec", + .codec_dai_name = "cs47l35-dsp3-txt", + .codec_name = "cs47l35-codec", + .ignore_suspend = 1, + .dynamic = 0, + }, + { + .name = "cpu-dsp1-text", + .stream_name = "cpu-dsp1-text", + .cpu_dai_name = "cs47l35-dsp1-cpu-txt", + .platform_name = "cs47l35-codec", + .codec_dai_name = "cs47l35-dsp1-txt", + .codec_name = "cs47l35-codec", + .ignore_suspend = 1, + .dynamic = 0, + } }; -- 2.20.1