| Message ID | 1465426980-10924-1-git-send-email-nicoleotsuka@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 88b1c01fb42e3d637c7e7f36cd4a30ce39a2add4 |
| Headers | show |
On Wed, Jun 8, 2016 at 4:03 PM, Nicolin Chen <nicoleotsuka@gmail.com> wrote: > SND_SOC_DAIFMT_IB_NF = 0x3 (11b) | SND_SOC_DAIFMT_IB_IF = 0x4 (100b) > creates a mask 0x7 (111b) which also includes SND_SOC_DAIFMT_IB_NF Oops, here should be NB_IF for (10b). Will send v2. Please ignore this one. > = 0x2 (10b). > > So this patch uses the traditional way to check the clock inversion. > > Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> > --- > sound/soc/codecs/cs53l30.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c > index ac90dd7..62daa0c 100644 > --- a/sound/soc/codecs/cs53l30.c > +++ b/sound/soc/codecs/cs53l30.c > @@ -598,8 +598,14 @@ static int cs53l30_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) > } > > /* Check to see if the SCLK is inverted */ > - if (fmt & (SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_IB_IF)) > + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { > + case SND_SOC_DAIFMT_IB_NF: > + case SND_SOC_DAIFMT_IB_IF: > aspcfg ^= CS53L30_ASP_SCLK_INV; > + break; > + default: > + break; > + } > > regmap_update_bits(priv->regmap, CS53L30_ASPCFG_CTL, > CS53L30_ASP_MS | CS53L30_ASP_SCLK_INV, aspcfg); > -- > 2.1.4 >
diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c index ac90dd7..62daa0c 100644 --- a/sound/soc/codecs/cs53l30.c +++ b/sound/soc/codecs/cs53l30.c @@ -598,8 +598,14 @@ static int cs53l30_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) } /* Check to see if the SCLK is inverted */ - if (fmt & (SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_IB_IF)) + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_IB_NF: + case SND_SOC_DAIFMT_IB_IF: aspcfg ^= CS53L30_ASP_SCLK_INV; + break; + default: + break; + } regmap_update_bits(priv->regmap, CS53L30_ASPCFG_CTL, CS53L30_ASP_MS | CS53L30_ASP_SCLK_INV, aspcfg);
SND_SOC_DAIFMT_IB_NF = 0x3 (11b) | SND_SOC_DAIFMT_IB_IF = 0x4 (100b) creates a mask 0x7 (111b) which also includes SND_SOC_DAIFMT_IB_NF = 0x2 (10b). So this patch uses the traditional way to check the clock inversion. Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> --- sound/soc/codecs/cs53l30.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)