Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0077aaf authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bec78c5f

sound/soc/fsl/eukrea-tlv320.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream, 
		return ret;

	}



	snd_soc_dai_set_tdm_slot(cpu_dai, 0xffffffc, 0xffffffc, 2, 0);

	snd_soc_dai_set_tdm_slot(cpu_dai, 0x3, 0x3, 2, 0);



	ret = snd_soc_dai_set_sysclk(cpu_dai, IMX_SSP_SYS_CLK, 0,

				SND_SOC_CLOCK_IN);

sound/soc/fsl/fsl_ssi.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

			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);

sound/soc/fsl/fsl_utils.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}

sound/soc/fsl/imx-mc13783.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static int imx_mc13783_hifi_hw_params(struct snd_pcm_substream *substream, 
	if (ret)

		return ret;



	ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0x0, 0xfffffffc, 2, 16);

	ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0x3, 0x3, 2, 16);

	if (ret)

		return ret;

sound/soc/fsl/imx-ssi.c

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ static int imx_ssi_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai, 
	sccr |= SSI_STCCR_DC(slots - 1);

	writel(sccr, ssi->base + SSI_SRCCR);



	writel(tx_mask, ssi->base + SSI_STMSK);

	writel(rx_mask, ssi->base + SSI_SRMSK);

	writel(~tx_mask, ssi->base + SSI_STMSK);

	writel(~rx_mask, ssi->base + SSI_SRMSK);



	return 0;

}