From 42233593978d65f3349974c194211a28cc370ade Mon Sep 17 00:00:00 2001 From: Li Xu Date: Tue, 21 Aug 2018 12:19:38 -0500 Subject: [PATCH] ASoC: cs35l41: Add slot selection for DSP A mode Add mixer control for selecting audio slot in DSP A audio stream. SQA-1109 Mot-Crs-fixed:(CR) Change-Id: I523d2a5a17dd1950fb8476e5a98fbb5208d164b5 Signed-off-by: Li Xu Reviewed-on: https://gerrit.mot.com/1253045 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Guobin Zhang Submit-Approved: Jira Key Reviewed-on: https://gerrit.mot.com/1253075 Reviewed-by: Rav(CR) Vembu --- sound/soc/codecs/cs35l41.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c index 891feba98909..3e7c4cf66fcf 100644 --- a/sound/soc/codecs/cs35l41.c +++ b/sound/soc/codecs/cs35l41.c @@ -473,6 +473,10 @@ static const struct snd_kcontrol_new cs35l41_aud_controls[] = { 0, 7, 0), SOC_SINGLE_RANGE("ASPTX4 Slot Position", CS35L41_SP_FRAME_TX_SLOT, 24, 0, 7, 0), + SOC_SINGLE_RANGE("ASPRX1 Slot Position", CS35L41_SP_FRAME_RX_SLOT, 0, + 0, 7, 0), + SOC_SINGLE_RANGE("ASPRX2 Slot Position", CS35L41_SP_FRAME_RX_SLOT, 8, + 0, 7, 0), SOC_ENUM("PCM Soft Ramp", pcm_sft_ramp), SOC_ENUM("Boost Enable", bst_en_ctl), SOC_VALUE_ENUM_EXT("CSPL Command", cs35l41_cspl_cmd, @@ -1211,7 +1215,7 @@ static int cs35l41_pcm_hw_params(struct snd_pcm_substream *substream, regmap_update_bits(cs35l41->regmap, CS35L41_SP_RX_WL, CS35L41_ASP_RX_WL_MASK, asp_wl << CS35L41_ASP_RX_WL_SHIFT); - if (cs35l41->i2s_mode || cs35l41->dspa_mode) { + if (cs35l41->i2s_mode) { regmap_update_bits(cs35l41->regmap, CS35L41_SP_FRAME_RX_SLOT, CS35L41_ASP_RX1_SLOT_MASK,