From 08970c53c20c604603ca086e2d789a9e379f5663 Mon Sep 17 00:00:00 2001 From: Phani Kumar Uppalapati Date: Wed, 10 Aug 2016 16:22:30 -0700 Subject: [PATCH 1/2] ARM: dts: msm: Add sb_6_rx phandle reference for sound DT node Add slimbus_6_rx phandle reference for asoc-cpu property in sound node for wcd934x codec. This enables audio playback support over headphones for msmcobalt platform. Change-Id: I36050f122e67f95cc7f2dbdd3c73b4de5baea785 Signed-off-by: Phani Kumar Uppalapati --- arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi index 1ef5e6351aa6..69f5614731b1 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi @@ -159,7 +159,7 @@ <&afe_proxy_tx>, <&incall_record_rx>, <&incall_record_tx>, <&incall_music_rx>, <&incall_music_2_rx>, <&sb_5_rx>, - <&usb_audio_rx>, <&usb_audio_tx>; + <&usb_audio_rx>, <&usb_audio_tx>, <&sb_6_rx>; asoc-cpu-names = "msm-dai-q6-hdmi.8", "msm-dai-q6-dev.16384", "msm-dai-q6-dev.16385", "msm-dai-q6-dev.16386", "msm-dai-q6-dev.16387", @@ -171,7 +171,8 @@ "msm-dai-q6-dev.240", "msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394", - "msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673"; + "msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673", + "msm-dai-q6-dev.16396"; asoc-codec = <&stub_codec>; asoc-codec-names = "msm-stub-codec.1"; qcom,wsa-max-devs = <2>; From bb017be51aaaab15e9168b9a277363bed8f5010c Mon Sep 17 00:00:00 2001 From: Phani Kumar Uppalapati Date: Wed, 10 Aug 2016 16:29:40 -0700 Subject: [PATCH 2/2] ASoC: msm: Add Slimbus6 playback dai-link Add slimbus6 playback back-end dai-link on msmcobalt platform with wcd934x audio codec. This dai-link enables audio playback over headphones. Change-Id: I83c2291909bda2473d7d0b3147b4a0244f7450b0 Signed-off-by: Phani Kumar Uppalapati --- sound/soc/msm/msmcobalt.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sound/soc/msm/msmcobalt.c b/sound/soc/msm/msmcobalt.c index 4d2347aabb25..02cce66ccc48 100644 --- a/sound/soc/msm/msmcobalt.c +++ b/sound/soc/msm/msmcobalt.c @@ -3125,6 +3125,22 @@ static struct snd_soc_dai_link msm_tavil_be_dai_links[] = { .ignore_pmdown_time = 1, .ignore_suspend = 1, }, + { + .name = LPASS_BE_SLIMBUS_6_RX, + .stream_name = "Slimbus6 Playback", + .cpu_dai_name = "msm-dai-q6-dev.16396", + .platform_name = "msm-pcm-routing", + .codec_name = "tavil_codec", + .codec_dai_name = "tavil_rx4", + .no_pcm = 1, + .dpcm_playback = 1, + .be_id = MSM_BACKEND_DAI_SLIMBUS_6_RX, + .be_hw_params_fixup = msm_be_hw_params_fixup, + .ops = &msm_be_ops, + /* dai link has playback support */ + .ignore_pmdown_time = 1, + .ignore_suspend = 1, + }, }; static struct snd_soc_dai_link msm_wcn_be_dai_links[] = {