Skip to content

Commit d85827f

Browse files
committed
ASoC: qcom: sc8280xp: Fix the sc8280xp driver to support Shikra cqm
Fix the sc8280xp driver to support Shikra cqm Signed-off-by: Mohammad Rafi Shaik <mohs@qti.qualcomm.com>
1 parent 3aaa6a7 commit d85827f

4 files changed

Lines changed: 8 additions & 1 deletion

File tree

include/dt-bindings/sound/qcom,lpass.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
#define LPASS_CDC_DMA_VA_TX7 32
4242
#define LPASS_CDC_DMA_VA_TX8 33
4343

44+
#define MI2S_SENARY 34
45+
4446
#define LPASS_MCLK0 0
4547

4648
#endif /* __DT_QCOM_LPASS_H */

sound/soc/qcom/common.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Copyright (c) 2018, Linaro Limited.
33
// Copyright (c) 2018, The Linux Foundation. All rights reserved.
44

5+
#include <dt-bindings/sound/qcom,lpass.h>
56
#include <dt-bindings/sound/qcom,q6afe.h>
67
#include <linux/module.h>
78
#include <sound/jack.h>
@@ -236,6 +237,7 @@ int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd,
236237
case TX_CODEC_DMA_TX_1:
237238
case TX_CODEC_DMA_TX_2:
238239
case TX_CODEC_DMA_TX_3:
240+
case LPASS_CDC_DMA_VA_TX1:
239241
for_each_rtd_codec_dais(rtd, i, codec_dai) {
240242
rval = snd_soc_component_set_jack(codec_dai->component,
241243
jack, NULL);

sound/soc/qcom/sc8280xp.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0
22
// Copyright (c) 2022, Linaro Limited
33

4+
#include <dt-bindings/sound/qcom,lpass.h>
45
#include <dt-bindings/sound/qcom,q6afe.h>
56
#include <linux/module.h>
67
#include <linux/platform_device.h>
@@ -86,6 +87,7 @@ static int sc8280xp_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
8687
case TX_CODEC_DMA_TX_1:
8788
case TX_CODEC_DMA_TX_2:
8889
case TX_CODEC_DMA_TX_3:
90+
case LPASS_CDC_DMA_VA_TX1:
8991
channels->min = 1;
9092
break;
9193
default:
@@ -127,7 +129,7 @@ static void sc8280xp_add_be_ops(struct snd_soc_card *card)
127129
int i;
128130

129131
for_each_card_prelinks(card, i, link) {
130-
if (link->no_pcm == 1) {
132+
if (link->no_pcm == 1 || link->num_codecs > 0) {
131133
link->init = sc8280xp_snd_init;
132134
link->be_hw_params_fixup = sc8280xp_be_hw_params_fixup;
133135
link->ops = &sc8280xp_be_ops;

sound/soc/qcom/sdw.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ static bool qcom_snd_is_sdw_dai(int id)
4141
switch (id) {
4242
case LPASS_CDC_DMA_TX3:
4343
case LPASS_CDC_DMA_RX0:
44+
case LPASS_CDC_DMA_VA_TX1:
4445
return true;
4546
default:
4647
break;

0 commit comments

Comments
 (0)