MLK-21940-1: ASoC: fsl_asrc: Update mxc_asrc uapi

In order to support the new ASRC in i.MX815, we update the
user api file mxc_asrc.h.

The reason is that the new ASRC support more sample width, and
support endianness, sign, float format, iec958 format setting,
All these type can be expressed by snd_pcm_format_t type.

So we use the in(out)put_format to instead the in(out)put_word_width.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>
(cherry picked from commit b95c32c4d4b51e3e55e1e28269a0e8bce0a04f98)

1 files changed, 13 insertions, 54 deletions

diff --git a/sound/soc/fsl/fsl_asrc_m2m.c b/sound/soc/fsl/fsl_asrc_m2m.c
index c478fa43e1bd..5ecf47d915b4 100644
--- a/sound/soc/fsl/fsl_asrc_m2m.c
+++ b/sound/soc/fsl/fsl_asrc_m2m.c
@@ -22,7 +22,7 @@ struct fsl_asrc_m2m {
 	unsigned int sg_nodes[2];
 	struct scatterlist sg[2][4];
 
-	enum asrc_word_width word_width[2];
+	snd_pcm_format_t word_format[2];
 	unsigned int rate[2];
 	unsigned int last_period_size;
 	u32 watermark[2];
@@ -84,7 +84,7 @@ static void fsl_asrc_read_last_FIFO(struct fsl_asrc_pair *pair)
 	u32 *reg24 = NULL;
 	u16 *reg16 = NULL;
 
-	if (m2m->word_width[OUT] == ASRC_WIDTH_24_BIT)
+	if (m2m->word_format[OUT] == SNDRV_PCM_FORMAT_S24_LE)
 		reg24 = output->dma_vaddr + output->length;
 	else
 		reg16 = output->dma_vaddr + output->length;
@@ -146,7 +146,7 @@ exit:
 
 static int fsl_asrc_dmaconfig(struct fsl_asrc_pair *pair, struct dma_chan *chan,
 			      u32 dma_addr, void *buf_addr, u32 buf_len,
-			      bool dir, enum asrc_word_width word_width)
+			      bool dir, snd_pcm_format_t word_format)
 {
 	struct dma_async_tx_descriptor *desc = pair->desc[dir];
 	struct fsl_asrc *asrc_priv = pair->asrc_priv;
@@ -158,14 +158,14 @@ static int fsl_asrc_dmaconfig(struct fsl_asrc_pair *pair, struct dma_chan *chan,
 	enum dma_slave_buswidth buswidth;
 	int ret, i;
 
-	switch (word_width) {
-	case ASRC_WIDTH_8_BIT:
+	switch (snd_pcm_format_physical_width(word_format)) {
+	case 8:
 		buswidth = DMA_SLAVE_BUSWIDTH_1_BYTE;
 		break;
-	case ASRC_WIDTH_16_BIT:
+	case 16:
 		buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES;
 		break;
-	case ASRC_WIDTH_24_BIT:
+	case 32:
 		buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES;
 		break;
 	default:
@@ -249,7 +249,6 @@ static int fsl_asrc_prepare_io_buffer(struct fsl_asrc_pair *pair,
 	struct fsl_asrc_m2m *m2m = pair->private;
 	struct fsl_asrc *asrc_priv = pair->asrc_priv;
 	unsigned int *dma_len = &m2m->dma_block[dir].length;
-	enum asrc_word_width width = m2m->word_width[dir];
 	void *dma_vaddr = m2m->dma_block[dir].dma_vaddr;
 	struct dma_chan *dma_chan = pair->dma_chan[dir];
 	unsigned int buf_len, wm = m2m->watermark[dir];
@@ -270,20 +269,7 @@ static int fsl_asrc_prepare_io_buffer(struct fsl_asrc_pair *pair,
 		buf_len = pbuf->output_buffer_length;
 	}
 
-	switch (width) {
-	case ASRC_WIDTH_24_BIT:
-		word_size = 4;
-		break;
-	case ASRC_WIDTH_16_BIT:
-		word_size = 2;
-		break;
-	case ASRC_WIDTH_8_BIT:
-		word_size = 1;
-		break;
-	default:
-		pair_err("wrong word length\n");
-		return -EINVAL;
-	}
+	word_size = snd_pcm_format_physical_width(m2m->word_format[dir]) / 8;
 
 	if (buf_len < word_size * pair->channels * wm ||
 	    buf_len > ASRC_DMA_BUFFER_SIZE ||
@@ -312,7 +298,7 @@ static int fsl_asrc_prepare_io_buffer(struct fsl_asrc_pair *pair,
 	fifo_addr = asrc_priv->paddr + REG_ASRDx(dir, index);
 
 	return fsl_asrc_dmaconfig(pair, dma_chan, fifo_addr, dma_vaddr,
-				  *dma_len, dir, width);
+				  *dma_len, dir, m2m->word_format[dir]);
 }
 
 static int fsl_asrc_prepare_buffer(struct fsl_asrc_pair *pair,
@@ -571,8 +557,8 @@ static long fsl_asrc_ioctl_config_pair(struct fsl_asrc_pair *pair,
 	m2m->dma_block[IN].length = ASRC_DMA_BUFFER_SIZE;
 	m2m->dma_block[OUT].length = ASRC_DMA_BUFFER_SIZE;
 
-	m2m->word_width[IN] = config.input_word_width;
-	m2m->word_width[OUT] = config.output_word_width;
+	m2m->word_format[IN] = config.input_format;
+	m2m->word_format[OUT] = config.output_format;
 
 	m2m->rate[IN] = config.input_sample_rate;
 	m2m->rate[OUT] = config.output_sample_rate;
@@ -655,35 +641,8 @@ static long fsl_asrc_calc_last_period_size(struct fsl_asrc_pair *pair,
 	unsigned int last_period_size;
 	unsigned int remain;
 
-	switch (m2m->word_width[IN]) {
-	case ASRC_WIDTH_24_BIT:
-		in_width = 4;
-		break;
-	case ASRC_WIDTH_16_BIT:
-		in_width = 2;
-		break;
-	case ASRC_WIDTH_8_BIT:
-		in_width = 1;
-		break;
-	default:
-		in_width = 2;
-		break;
-	}
-
-	switch (m2m->word_width[OUT]) {
-	case ASRC_WIDTH_24_BIT:
-		out_width = 4;
-		break;
-	case ASRC_WIDTH_16_BIT:
-		out_width = 2;
-		break;
-	case ASRC_WIDTH_8_BIT:
-		out_width = 1;
-		break;
-	default:
-		out_width = 2;
-		break;
-	}
+	in_width = snd_pcm_format_physical_width(m2m->word_format[IN]) / 8;
+	out_width = snd_pcm_format_physical_width(m2m->word_format[OUT]) / 8;
 
 	in_samples = pbuf->input_buffer_length / (in_width * channels);