From cc135373aad1d95d1272f856a99d37d095bf1918 Mon Sep 17 00:00:00 2001 From: Li Xu Date: Mon, 20 Aug 2018 17:40:27 -0500 Subject: [PATCH] ASoC: cs35l41: Rename TDM to DSP A mode cs35l41 supports both DSP A and TDM 1.5 modes. To distinguish between the 2 modes, rename TDM to DSP A mode, which is currently used by driver. SQA-1109 Mot-Crs-fixed:(CR) Change-Id: I0636c067ec1845a1180e40891c08d9818f7f7b08 Signed-off-by: Li Xu Reviewed-on: https://gerrit.mot.com/1253044 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/1253074 Reviewed-by: Rav(CR) Vembu Reviewed-by: Yuesheng Huang --- include/sound/cs35l41.h | 2 +- sound/soc/codecs/cs35l41.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/sound/cs35l41.h b/include/sound/cs35l41.h index b138d4ce778e..5af4fb46b431 100644 --- a/include/sound/cs35l41.h +++ b/include/sound/cs35l41.h @@ -62,7 +62,7 @@ struct cs35l41_private { int extclk_cfg; int sclk; unsigned int cspl_cmd; - bool tdm_mode; + bool dspa_mode; bool i2s_mode; bool swire_mode; bool halo_booted; diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c index 29b38e19418a..891feba98909 100644 --- a/sound/soc/codecs/cs35l41.c +++ b/sound/soc/codecs/cs35l41.c @@ -980,12 +980,12 @@ static int cs35l41_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) case SND_SOC_DAIFMT_DSP_A: asp_fmt = 0; cs35l41->i2s_mode = false; - cs35l41->tdm_mode = true; + cs35l41->dspa_mode = true; break; case SND_SOC_DAIFMT_I2S: asp_fmt = 2; cs35l41->i2s_mode = true; - cs35l41->tdm_mode = false; + cs35l41->dspa_mode = false; break; default: dev_warn(cs35l41->dev, "cs35l41_set_dai_fmt: Invalid or unsupported DAI format\n"); @@ -1211,7 +1211,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->tdm_mode) { + if (cs35l41->i2s_mode || cs35l41->dspa_mode) { regmap_update_bits(cs35l41->regmap, CS35L41_SP_FRAME_RX_SLOT, CS35L41_ASP_RX1_SLOT_MASK,