ASoC: tas5086: Convert to params_width()
Subsystems (3)
Mark Brown
maintainerPATCH 1/7 ASoC: tas5086: Convert to params_width()
From: Mark Brown <[email protected]>
The CODEC doesn't care how data is laid out in memory.
--- sound/soc/codecs/tas5086.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/tas5086.c +4 -4
@@ -425,14 +425,14 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream, }/* ... then add the offset for the sample bit depth. */ -switch (params_format (params)) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 : val +=0 ;break ; -case SNDRV_PCM_FORMAT_S20_3LE : +case 20 : val +=1 ;break ; -case SNDRV_PCM_FORMAT_S24_3LE : +case 24 : val +=2 ;break ;default :
Signature · 1 line
2.0.1
Mark Brown
maintainerPATCH 2/7 ASoC: tlv320aic26: Convert to params_width()
From: Mark Brown <[email protected]>
The CODEC doesn't care how data is laid out in memory.
--- sound/soc/codecs/tlv320aic26.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
sound/soc/codecs/tlv320aic26.c +7 -7
@@ -71,8 +71,8 @@ static int aic26_hw_params(struct snd_pcm_substream *substream,dev_dbg (&aic26->spi->dev,"aic26_hw_params(substream=%p, params=%p)\n" , substream, params); -dev_dbg (&aic26->spi->dev,"rate=%i format=%i\n" ,params_rate (params), -params_format (params)); +dev_dbg (&aic26->spi->dev,"rate=%i width=%d\n" ,params_rate (params), +params_width (params));switch (params_rate (params)) {case 8000 : fsref =48000 ; divisor =AIC26_DIV_6 ;break ;
@@ -89,11 +89,11 @@ static int aic26_hw_params(struct snd_pcm_substream *substream, }/* select data word length */ -switch (params_format (params)) { -case SNDRV_PCM_FORMAT_S8 : wlen =AIC26_WLEN_16 ;break ; -case SNDRV_PCM_FORMAT_S16_BE : wlen =AIC26_WLEN_16 ;break ; -case SNDRV_PCM_FORMAT_S24_BE : wlen =AIC26_WLEN_24 ;break ; -case SNDRV_PCM_FORMAT_S32_BE : wlen =AIC26_WLEN_32 ;break ; +switch (params_width (params)) { +case 8 : wlen =AIC26_WLEN_16 ;break ; +case 16 : wlen =AIC26_WLEN_16 ;break ; +case 24 : wlen =AIC26_WLEN_24 ;break ; +case 32 : wlen =AIC26_WLEN_32 ;break ;default :dev_dbg (&aic26->spi->dev,"bad format\n" );return -EINVAL ; }
Signature · 1 line
2.0.1
Mark Brown
maintainerPATCH 3/7 ASoC: tlv320aic31xx: Convert to params_width()
In reply to Mark BrownFrom: Mark Brown <[email protected]>
The CODEC doesn't care how data is laid out in memory.
--- sound/soc/codecs/tlv320aic31xx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/tlv320aic31xx.c +4 -4
@@ -760,8 +760,8 @@ static int aic31xx_hw_params(struct snd_pcm_substream *substream,struct snd_soc_codec *codec = dai->codec;u8 data =0 ; -dev_dbg (codec->dev,"## %s: format %d width %d rate %d\n" , - __func__,params_format (params),params_width (params), +dev_dbg (codec->dev,"## %s: width %d rate %d\n" , + __func__,params_width (params),params_rate (params));switch (params_width (params)) {
@@ -780,8 +780,8 @@ static int aic31xx_hw_params(struct snd_pcm_substream *substream, AIC31XX_IFACE1_DATALEN_SHIFT);break ;default : -dev_err (codec->dev,"%s: Unsupported format %d\n" , - __func__,params_format (params)); +dev_err (codec->dev,"%s: Unsupported width %d\n" , + __func__,params_width (params));return -EINVAL ; }
Signature · 1 line
2.0.1
Mark Brown
maintainerPATCH 4/7 ASoC: tlv320aic32x4: Convert to params_width()
In reply to Mark BrownFrom: Mark Brown <[email protected]>
The CODEC doesn't care how data is laid out in memory.
--- sound/soc/codecs/tlv320aic32x4.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/codecs/tlv320aic32x4.c +5 -5
@@ -450,16 +450,16 @@ static int aic32x4_hw_params(struct snd_pcm_substream *substream, data =snd_soc_read (codec,AIC32X4_IFACE1 ); data = data & ~(3 <<4 ); -switch (params_format (params)) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 :break ; -case SNDRV_PCM_FORMAT_S20_3LE : +case 20 : data |= (AIC32X4_WORD_LEN_20BITS <<AIC32X4_DOSRMSB_SHIFT );break ; -case SNDRV_PCM_FORMAT_S24_LE : +case 24 : data |= (AIC32X4_WORD_LEN_24BITS <<AIC32X4_DOSRMSB_SHIFT );break ; -case SNDRV_PCM_FORMAT_S32_LE : +case 32 : data |= (AIC32X4_WORD_LEN_32BITS <<AIC32X4_DOSRMSB_SHIFT );break ; }
Signature · 1 line
2.0.1
Mark Brown
maintainerPATCH 5/7 ASoC: tlv320aic3x: Convert to params_width()
In reply to Mark BrownFrom: Mark Brown <[email protected]>
The CODEC doesn't care how data is laid out in memory.
--- sound/soc/codecs/tlv320aic3x.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
sound/soc/codecs/tlv320aic3x.c +5 -6
@@ -873,17 +873,16 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream,/* select data word length */ data =snd_soc_read (codec,AIC3X_ASD_INTF_CTRLB ) & (~(0x3 <<4 )); -switch (params_format (params)) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 :break ; -case SNDRV_PCM_FORMAT_S20_3LE : +case 20 : data |= (0x01 <<4 );break ; -case SNDRV_PCM_FORMAT_S24_3LE : -case SNDRV_PCM_FORMAT_S24_LE : +case 24 : data |= (0x02 <<4 );break ; -case SNDRV_PCM_FORMAT_S32_LE : +case 32 : data |= (0x03 <<4 );break ; }
Signature · 1 line
2.0.1
Mark Brown
maintainerPATCH 6/7 ASoC: tlv320dac33: Convert to params_width()
In reply to Mark BrownFrom: Mark Brown <[email protected]>
The CODEC doesn't care how data is laid out in memory.
--- sound/soc/codecs/tlv320dac33.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/codecs/tlv320dac33.c +5 -5
@@ -832,18 +832,18 @@ static int dac33_hw_params(struct snd_pcm_substream *substream,return -EINVAL ; } -switch (params_format (params)) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 : dac33->fifo_size =DAC33_FIFO_SIZE_16BIT ; dac33->burst_rate =CALC_BURST_RATE (dac33->burst_bclkdiv,32 );break ; -case SNDRV_PCM_FORMAT_S32_LE : +case 32 : dac33->fifo_size =DAC33_FIFO_SIZE_24BIT ; dac33->burst_rate =CALC_BURST_RATE (dac33->burst_bclkdiv,64 );break ;default : -dev_err (codec->dev,"unsupported format %d\n" , -params_format (params)); +dev_err (codec->dev,"unsupported width %d\n" , +params_width (params));return -EINVAL ; }
Signature · 1 line
2.0.1
Re: [PATCH 6/7] ASoC: tlv320dac33: Convert to params_width()
Quoted 3 lines · Mark Brown
From: Mark Brown <[email protected]>
The CODEC doesn't care how data is laid out in memory.
Quoted 35 lines
Signed-off-by Mark Brown <[email protected]>--- sound/soc/codecs/tlv320dac33.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)sound/soc/codecs/tlv320dac33.c +5
-5@@ -832,18 +832,18 @@ static int dac33_hw_params(struct snd_pcm_substream *substream,return -EINVAL ; } -switch (params_format (params)) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 : dac33->fifo_size =DAC33_FIFO_SIZE_16BIT ; dac33->burst_rate =CALC_BURST_RATE (dac33->burst_bclkdiv,32 );break ; -case SNDRV_PCM_FORMAT_S32_LE : +case 32 : dac33->fifo_size =DAC33_FIFO_SIZE_24BIT ; dac33->burst_rate =CALC_BURST_RATE (dac33->burst_bclkdiv,64 );break ;default : -dev_err (codec->dev,"unsupported format %d\n" , -params_format (params)); +dev_err (codec->dev,"unsupported width %d\n" , +params_width (params));return -EINVAL ; }
Signature · 1 line
Péter
Mark Brown
maintainerPATCH 7/7 ASoC: twl4030: Convert to params_width()
In reply to Mark BrownFrom: Mark Brown <[email protected]>
The CODEC doesn't care how data is laid out in memory.
--- sound/soc/codecs/twl4030.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/codecs/twl4030.c +5 -5
@@ -1763,16 +1763,16 @@ static int twl4030_hw_params(struct snd_pcm_substream *substream, old_format =twl4030_read (codec,TWL4030_REG_AUDIO_IF ); format = old_format; format &= ~TWL4030_DATA_WIDTH ; -switch (params_format (params)) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 : format |=TWL4030_DATA_WIDTH_16S_16W ;break ; -case SNDRV_PCM_FORMAT_S32_LE : +case 32 : format |=TWL4030_DATA_WIDTH_32S_24W ;break ;default : -dev_err (codec->dev,"%s: unknown format %d\n" , __func__, -params_format (params)); +dev_err (codec->dev,"%s: unsupported bits/sample %d\n" , + __func__,params_width (params));return -EINVAL ; }
Signature · 1 line
2.0.1
Re: [PATCH 7/7] ASoC: twl4030: Convert to params_width()
Quoted 3 lines · Mark Brown
From: Mark Brown <[email protected]>
The CODEC doesn't care how data is laid out in memory.
Quoted 33 lines
Signed-off-by Mark Brown <[email protected]>--- sound/soc/codecs/twl4030.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)sound/soc/codecs/twl4030.c +5
-5@@ -1763,16 +1763,16 @@ static int twl4030_hw_params(struct snd_pcm_substream *substream, old_format =twl4030_read (codec,TWL4030_REG_AUDIO_IF ); format = old_format; format &= ~TWL4030_DATA_WIDTH ; -switch (params_format (params)) { -case SNDRV_PCM_FORMAT_S16_LE : +switch (params_width (params)) { +case 16 : format |=TWL4030_DATA_WIDTH_16S_16W ;break ; -case SNDRV_PCM_FORMAT_S32_LE : +case 32 : format |=TWL4030_DATA_WIDTH_32S_24W ;break ;default : -dev_err (codec->dev,"%s: unknown format %d\n" , __func__, -params_format (params)); +dev_err (codec->dev,"%s: unsupported bits/sample %d\n" , + __func__,params_width (params));return -EINVAL ; }
Signature · 1 line
Péter