diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-12 04:27:18 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-14 14:04:47 -0500 |
commit | d0077aaf2206f3c3524d71a9f38b408dca63852f (patch) | |
tree | ed555df8340cc4e329afd36570e7aa0ba91a5c8a /sound/soc/fsl/fsl_ssi.c | |
parent | bec78c5f4ae228c4cbd432e97cadb8827fd8f1f9 (diff) |
ASoC: fsl: Update set_tdm_slot() semantics
The fsl-ssi and imx-ssi drivers use inverted semantics for the tx_mask and
rx_mask parameter of the set_tdm_slot() callback compared to rest of ASoC.
This patch updates the driver's semantics to be consistent with the rest of
ASoC, i.e. a set bit means a active slot and a cleared bit means a inactive
slot. This will allow us to use the set_tdm_slot() API in a more generic
way.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/fsl/fsl_ssi.c')
-rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index a65f17d57ffb..8841e59a9869 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c | |||
@@ -992,8 +992,8 @@ static int fsl_ssi_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, | |||
992 | regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_SSIEN, | 992 | regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_SSIEN, |
993 | CCSR_SSI_SCR_SSIEN); | 993 | CCSR_SSI_SCR_SSIEN); |
994 | 994 | ||
995 | regmap_write(regs, CCSR_SSI_STMSK, tx_mask); | 995 | regmap_write(regs, CCSR_SSI_STMSK, ~tx_mask); |
996 | regmap_write(regs, CCSR_SSI_SRMSK, rx_mask); | 996 | regmap_write(regs, CCSR_SSI_SRMSK, ~rx_mask); |
997 | 997 | ||
998 | regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_SSIEN, val); | 998 | regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_SSIEN, val); |
999 | 999 | ||