summaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl/fsl_utils.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-01-12 10:27:18 +0100
committerMark Brown <broonie@kernel.org>2015-01-14 20:04:47 +0100
commitd0077aaf2206f3c3524d71a9f38b408dca63852f (patch)
treeed555df8340cc4e329afd36570e7aa0ba91a5c8a /sound/soc/fsl/fsl_utils.c
parentASoC: mc13783: Update set_tdm_slot() semantics (diff)
downloadlinux-d0077aaf2206f3c3524d71a9f38b408dca63852f.tar.xz
linux-d0077aaf2206f3c3524d71a9f38b408dca63852f.zip
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_utils.c')
-rw-r--r--sound/soc/fsl/fsl_utils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/fsl_utils.c b/sound/soc/fsl/fsl_utils.c
index 2ac7755da876..5fd4463dbf05 100644
--- a/sound/soc/fsl/fsl_utils.c
+++ b/sound/soc/fsl/fsl_utils.c
@@ -94,7 +94,7 @@ EXPORT_SYMBOL(fsl_asoc_get_dma_channel);
* @rx_mask: bitmask representing active RX slots.
*
* This function used to generate the TDM slot TX/RX mask. And the TX/RX
- * mask will use a 0 bit for an active slot as default, and the default
+ * mask will use a 1 bit for an active slot as default, and the default
* active bits are at the LSB of the mask value.
*/
int fsl_asoc_xlate_tdm_slot_mask(unsigned int slots,
@@ -105,9 +105,9 @@ int fsl_asoc_xlate_tdm_slot_mask(unsigned int slots,
return -EINVAL;
if (tx_mask)
- *tx_mask = ~((1 << slots) - 1);
+ *tx_mask = ((1 << slots) - 1);
if (rx_mask)
- *rx_mask = ~((1 << slots) - 1);
+ *rx_mask = ((1 << slots) - 1);
return 0;
}