path: root/sound/soc/fsl/fsl_ssi.c
diff options
authorLars-Peter Clausen <>2015-01-12 10:27:18 +0100
committerMark Brown <>2015-01-14 19:04:47 +0000
commitd0077aaf2206f3c3524d71a9f38b408dca63852f (patch)
treeed555df8340cc4e329afd36570e7aa0ba91a5c8a /sound/soc/fsl/fsl_ssi.c
parentbec78c5f4ae228c4cbd432e97cadb8827fd8f1f9 (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 <> Acked-by: Nicolin Chen <> Signed-off-by: Mark Brown <>
Diffstat (limited to 'sound/soc/fsl/fsl_ssi.c')
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,
regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_SSIEN,
- regmap_write(regs, CCSR_SSI_STMSK, tx_mask);
- regmap_write(regs, CCSR_SSI_SRMSK, rx_mask);
+ regmap_write(regs, CCSR_SSI_STMSK, ~tx_mask);
+ regmap_write(regs, CCSR_SSI_SRMSK, ~rx_mask);
regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_SSIEN, val);