diff options
author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-02-10 01:47:17 -0500 |
---|---|---|
committer | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-04-30 07:29:42 -0400 |
commit | 7032c46ab074fe823e6c541823caf59a67007961 (patch) | |
tree | 75c2395f2d7ff033f570bd3dd4d5ca1d6640f6ce | |
parent | 8b87f50da11029f4ad90b5b60f328bad92d16a52 (diff) |
ASoC: fsl-esai: fix ESAI TDM slot setting
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Acked-by: Nicolin Chen <Guangyu.Chen@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 236014ac7a6524f9f466139c2e47af70cb340ba3)
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
-rw-r--r-- | sound/soc/fsl/fsl_esai.c | 4 | ||||
-rw-r--r-- | sound/soc/fsl/fsl_esai.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index 5a230707da16..36d7a184827e 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c | |||
@@ -332,7 +332,7 @@ static int fsl_esai_set_dai_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, | |||
332 | regmap_update_bits(esai_priv->regmap, REG_ESAI_TSMA, | 332 | regmap_update_bits(esai_priv->regmap, REG_ESAI_TSMA, |
333 | ESAI_xSMA_xS_MASK, ESAI_xSMA_xS(tx_mask)); | 333 | ESAI_xSMA_xS_MASK, ESAI_xSMA_xS(tx_mask)); |
334 | regmap_update_bits(esai_priv->regmap, REG_ESAI_TSMB, | 334 | regmap_update_bits(esai_priv->regmap, REG_ESAI_TSMB, |
335 | ESAI_xSMA_xS_MASK, ESAI_xSMB_xS(tx_mask)); | 335 | ESAI_xSMB_xS_MASK, ESAI_xSMB_xS(tx_mask)); |
336 | 336 | ||
337 | regmap_update_bits(esai_priv->regmap, REG_ESAI_RCCR, | 337 | regmap_update_bits(esai_priv->regmap, REG_ESAI_RCCR, |
338 | ESAI_xCCR_xDC_MASK, ESAI_xCCR_xDC(slots)); | 338 | ESAI_xCCR_xDC_MASK, ESAI_xCCR_xDC(slots)); |
@@ -340,7 +340,7 @@ static int fsl_esai_set_dai_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, | |||
340 | regmap_update_bits(esai_priv->regmap, REG_ESAI_RSMA, | 340 | regmap_update_bits(esai_priv->regmap, REG_ESAI_RSMA, |
341 | ESAI_xSMA_xS_MASK, ESAI_xSMA_xS(rx_mask)); | 341 | ESAI_xSMA_xS_MASK, ESAI_xSMA_xS(rx_mask)); |
342 | regmap_update_bits(esai_priv->regmap, REG_ESAI_RSMB, | 342 | regmap_update_bits(esai_priv->regmap, REG_ESAI_RSMB, |
343 | ESAI_xSMA_xS_MASK, ESAI_xSMB_xS(rx_mask)); | 343 | ESAI_xSMB_xS_MASK, ESAI_xSMB_xS(rx_mask)); |
344 | 344 | ||
345 | esai_priv->slot_width = slot_width; | 345 | esai_priv->slot_width = slot_width; |
346 | 346 | ||
diff --git a/sound/soc/fsl/fsl_esai.h b/sound/soc/fsl/fsl_esai.h index 9c9f957fcae1..75e14033e8d8 100644 --- a/sound/soc/fsl/fsl_esai.h +++ b/sound/soc/fsl/fsl_esai.h | |||
@@ -322,7 +322,7 @@ | |||
322 | #define ESAI_xSMB_xS_SHIFT 0 | 322 | #define ESAI_xSMB_xS_SHIFT 0 |
323 | #define ESAI_xSMB_xS_WIDTH 16 | 323 | #define ESAI_xSMB_xS_WIDTH 16 |
324 | #define ESAI_xSMB_xS_MASK (((1 << ESAI_xSMB_xS_WIDTH) - 1) << ESAI_xSMB_xS_SHIFT) | 324 | #define ESAI_xSMB_xS_MASK (((1 << ESAI_xSMB_xS_WIDTH) - 1) << ESAI_xSMB_xS_SHIFT) |
325 | #define ESAI_xSMB_xS(v) (((v) >> ESAI_xSMA_xS_WIDTH) & ESAI_xSMA_xS_MASK) | 325 | #define ESAI_xSMB_xS(v) (((v) >> ESAI_xSMA_xS_WIDTH) & ESAI_xSMB_xS_MASK) |
326 | 326 | ||
327 | /* Port C Direction Register -- REG_ESAI_PRRC 0xF8 */ | 327 | /* Port C Direction Register -- REG_ESAI_PRRC 0xF8 */ |
328 | #define ESAI_PRRC_PDC_SHIFT 0 | 328 | #define ESAI_PRRC_PDC_SHIFT 0 |