ASoC: fsl: Remove fsl_asoc_xlate_tdm_slot_mask()
Now that the fsl DAI drivers uses the same semantics as the rest of a ASoC the custom fsl_asoc_xlate_tdm_slot_mask() callback can be removed as it is identical to the generic one. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
d0077aaf22
commit
bbcdb69dfc
|
@ -86,33 +86,6 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np,
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(fsl_asoc_get_dma_channel);
|
EXPORT_SYMBOL(fsl_asoc_get_dma_channel);
|
||||||
|
|
||||||
/**
|
|
||||||
* fsl_asoc_xlate_tdm_slot_mask - generate TDM slot TX/RX mask.
|
|
||||||
*
|
|
||||||
* @slots: Number of slots in use.
|
|
||||||
* @tx_mask: bitmask representing active TX slots.
|
|
||||||
* @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 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,
|
|
||||||
unsigned int *tx_mask,
|
|
||||||
unsigned int *rx_mask)
|
|
||||||
{
|
|
||||||
if (!slots)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
if (tx_mask)
|
|
||||||
*tx_mask = ((1 << slots) - 1);
|
|
||||||
if (rx_mask)
|
|
||||||
*rx_mask = ((1 << slots) - 1);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(fsl_asoc_xlate_tdm_slot_mask);
|
|
||||||
|
|
||||||
MODULE_AUTHOR("Timur Tabi <timur@freescale.com>");
|
MODULE_AUTHOR("Timur Tabi <timur@freescale.com>");
|
||||||
MODULE_DESCRIPTION("Freescale ASoC utility code");
|
MODULE_DESCRIPTION("Freescale ASoC utility code");
|
||||||
MODULE_LICENSE("GPL v2");
|
MODULE_LICENSE("GPL v2");
|
||||||
|
|
|
@ -22,7 +22,4 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np, const char *name,
|
||||||
struct snd_soc_dai_link *dai,
|
struct snd_soc_dai_link *dai,
|
||||||
unsigned int *dma_channel_id,
|
unsigned int *dma_channel_id,
|
||||||
unsigned int *dma_id);
|
unsigned int *dma_id);
|
||||||
int fsl_asoc_xlate_tdm_slot_mask(unsigned int slots,
|
|
||||||
unsigned int *tx_mask,
|
|
||||||
unsigned int *rx_mask);
|
|
||||||
#endif /* _FSL_UTILS_H */
|
#endif /* _FSL_UTILS_H */
|
||||||
|
|
|
@ -340,7 +340,6 @@ static const struct snd_soc_dai_ops imx_ssi_pcm_dai_ops = {
|
||||||
.set_fmt = imx_ssi_set_dai_fmt,
|
.set_fmt = imx_ssi_set_dai_fmt,
|
||||||
.set_clkdiv = imx_ssi_set_dai_clkdiv,
|
.set_clkdiv = imx_ssi_set_dai_clkdiv,
|
||||||
.set_sysclk = imx_ssi_set_dai_sysclk,
|
.set_sysclk = imx_ssi_set_dai_sysclk,
|
||||||
.xlate_tdm_slot_mask = fsl_asoc_xlate_tdm_slot_mask,
|
|
||||||
.set_tdm_slot = imx_ssi_set_dai_tdm_slot,
|
.set_tdm_slot = imx_ssi_set_dai_tdm_slot,
|
||||||
.trigger = imx_ssi_trigger,
|
.trigger = imx_ssi_trigger,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue