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

Commit 08db48f1 authored by Barry Song's avatar Barry Song Committed by Mark Brown
Browse files

ASoC: use set_channel_map api to reorder channels for AD1938 and AD1836 



Signed-off-by: default avatarBarry Song <barry.song@analog.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent fd5ad654

sound/soc/blackfin/bf5xx-ad1836.c

+7 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ static int bf5xx_ad1836_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;

	unsigned int channel_map[] = {0, 4, 1, 5, 2, 6, 3, 7};

	int ret = 0;

	/* set cpu DAI configuration */

	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A |
@@ -65,6 +66,12 @@ static int bf5xx_ad1836_hw_params(struct snd_pcm_substream *substream, 
	if (ret < 0)

		return ret;



	/* set cpu DAI channel mapping */

	ret = snd_soc_dai_set_channel_map(cpu_dai, ARRAY_SIZE(channel_map),

		channel_map, ARRAY_SIZE(channel_map), channel_map);

	if (ret < 0)

		return ret;



	return 0;

}

sound/soc/blackfin/bf5xx-ad1938.c

+8 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ static int bf5xx_ad1938_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;

	unsigned int channel_map[] = {0, 1, 2, 3, 4, 5, 6, 7};

	int ret = 0;

	/* set cpu DAI configuration */

	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A |
@@ -75,7 +76,13 @@ static int bf5xx_ad1938_hw_params(struct snd_pcm_substream *substream, 
		return ret;



	/* set codec DAI slots, 8 channels, all channels are enabled */

	ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xFF, 8);

	ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xFF, 0xFF, 8, 32);

	if (ret < 0)

		return ret;



	/* set cpu DAI channel mapping */

	ret = snd_soc_dai_set_channel_map(cpu_dai, ARRAY_SIZE(channel_map),

		channel_map, ARRAY_SIZE(channel_map), channel_map);

	if (ret < 0)

		return ret;

sound/soc/blackfin/bf5xx-tdm-pcm.c

+6 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include "bf5xx-tdm.h"

#include "bf5xx-sport.h"



#define PCM_BUFFER_MAX  0x10000

#define PCM_BUFFER_MAX  0x8000

#define FRAGMENT_SIZE_MIN  (4*1024)

#define FRAGMENTS_MIN  2

#define FRAGMENTS_MAX  32
@@ -177,6 +177,9 @@ static int bf5xx_pcm_open(struct snd_pcm_substream *substream) 
static int bf5xx_pcm_copy(struct snd_pcm_substream *substream, int channel,

	snd_pcm_uframes_t pos, void *buf, snd_pcm_uframes_t count)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct sport_device *sport = runtime->private_data;

	struct bf5xx_tdm_port *tdm_port = sport->private_data;

	unsigned int *src;

	unsigned int *dst;

	int i;
@@ -188,7 +191,7 @@ static int bf5xx_pcm_copy(struct snd_pcm_substream *substream, int channel, 
		dst += pos * 8;

		while (count--) {

			for (i = 0; i < substream->runtime->channels; i++)

				*(dst + i) = *src++;

				*(dst + tdm_port->tx_map[i]) = *src++;

			dst += 8;

		}

	} else {
@@ -198,7 +201,7 @@ static int bf5xx_pcm_copy(struct snd_pcm_substream *substream, int channel, 
		src += pos * 8;

		while (count--) {

			for (i = 0; i < substream->runtime->channels; i++)

				*dst++ = *(src+i);

				*dst++ = *(src + tdm_port->rx_map[i]);

			src += 8;

		}

	}

sound/soc/blackfin/bf5xx-tdm.c

+37 −8
Original line number Diff line number Diff line
@@ -46,14 +46,6 @@ 
#include "bf5xx-sport.h"

#include "bf5xx-tdm.h"



struct bf5xx_tdm_port {

	u16 tcr1;

	u16 rcr1;

	u16 tcr2;

	u16 rcr2;

	int configured;

};



static struct bf5xx_tdm_port bf5xx_tdm;

static int sport_num = CONFIG_SND_BF5XX_SPORT_NUM;
@@ -181,6 +173,40 @@ static void bf5xx_tdm_shutdown(struct snd_pcm_substream *substream, 
		bf5xx_tdm.configured = 0;

}



static int bf5xx_tdm_set_channel_map(struct snd_soc_dai *dai,

		unsigned int tx_num, unsigned int *tx_slot,

		unsigned int rx_num, unsigned int *rx_slot)

{

	int i;

	unsigned int slot;

	unsigned int tx_mapped = 0, rx_mapped = 0;



	if ((tx_num > BFIN_TDM_DAI_MAX_SLOTS) ||

			(rx_num > BFIN_TDM_DAI_MAX_SLOTS))

		return -EINVAL;



	for (i = 0; i < tx_num; i++) {

		slot = tx_slot[i];

		if ((slot < BFIN_TDM_DAI_MAX_SLOTS) &&

				(!(tx_mapped & (1 << slot)))) {

			bf5xx_tdm.tx_map[i] = slot;

			tx_mapped |= 1 << slot;

		} else

			return -EINVAL;

	}

	for (i = 0; i < rx_num; i++) {

		slot = rx_slot[i];

		if ((slot < BFIN_TDM_DAI_MAX_SLOTS) &&

				(!(rx_mapped & (1 << slot)))) {

			bf5xx_tdm.rx_map[i] = slot;

			rx_mapped |= 1 << slot;

		} else

			return -EINVAL;

	}



	return 0;

}



#ifdef CONFIG_PM

static int bf5xx_tdm_suspend(struct snd_soc_dai *dai)

{
@@ -235,6 +261,7 @@ static struct snd_soc_dai_ops bf5xx_tdm_dai_ops = { 
	.hw_params      = bf5xx_tdm_hw_params,

	.set_fmt        = bf5xx_tdm_set_dai_fmt,

	.shutdown       = bf5xx_tdm_shutdown,

	.set_channel_map   = bf5xx_tdm_set_channel_map,

};



struct snd_soc_dai bf5xx_tdm_dai = {
@@ -300,6 +327,8 @@ static int __devinit bfin_tdm_probe(struct platform_device *pdev) 
		pr_err("Failed to register DAI: %d\n", ret);

		goto sport_config_err;

	}



	sport_handle->private_data = &bf5xx_tdm;

	return 0;



sport_config_err:

sound/soc/blackfin/bf5xx-tdm.h

+11 −0
Original line number Diff line number Diff line
@@ -9,6 +9,17 @@ 
#ifndef _BF5XX_TDM_H

#define _BF5XX_TDM_H



#define BFIN_TDM_DAI_MAX_SLOTS 8

struct bf5xx_tdm_port {

	u16 tcr1;

	u16 rcr1;

	u16 tcr2;

	u16 rcr2;

	unsigned int tx_map[BFIN_TDM_DAI_MAX_SLOTS];

	unsigned int rx_map[BFIN_TDM_DAI_MAX_SLOTS];

	int configured;

};



extern struct snd_soc_dai bf5xx_tdm_dai;



#endif