use set_channel_map api to reorder channels for AD1938 and AD1836
PATCH v2 1/1 use set_channel_map api to reorder channels for AD1938 and AD1836
From: Barry Song <[email protected]>
Signed-off-by Barry Song <[email protected]>
--- sound/soc/blackfin/bf5xx-ad1836.c | 7 +++++ sound/soc/blackfin/bf5xx-ad1938.c | 9 ++++++- sound/soc/blackfin/bf5xx-tdm-pcm.c | 9 ++++-- sound/soc/blackfin/bf5xx-tdm.c | 45 +++++++++++++++++++++++++++++------ sound/soc/blackfin/bf5xx-tdm.h | 11 ++++++++ 5 files changed, 69 insertions(+), 12 deletions(-)
sound/soc/blackfin/bf5xx-ad1836.c +7 -0
@@ -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
@@ -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
@@ -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 @@ out: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
69 lines not on this page · raw message
sound/soc/blackfin/bf5xx-tdm.h +11 -0
@@ -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
Signature · 1 line
1.5.6.3
Mark Brown
AppliedQuoted 3 lines · Barry Song
From: Barry Song <[email protected]>
Signed-off-by Barry Song <[email protected]>
Applied, thanks.