aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-07-31 07:46:05 -0400
committerMark Brown <broonie@linaro.org>2014-07-31 08:30:06 -0400
commitdacc2aefcc8bf019af0d559561339dfef8829a10 (patch)
tree457ff3211f7c4e9ba526a79af7bbeec96a47d520 /sound
parent794f33d2fb9823adbcd99d002ea3f9eb4379ae4d (diff)
ASoC: sgtl5000: Convert to params_width()
The CODEC doesn't care how data is laid out in memory. Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/sgtl5000.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 3d39f0b5b4a8..a0e1f9c67ab2 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -724,25 +724,25 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream,
724 return ret; 724 return ret;
725 725
726 /* set i2s data format */ 726 /* set i2s data format */
727 switch (params_format(params)) { 727 switch (params_width(params)) {
728 case SNDRV_PCM_FORMAT_S16_LE: 728 case 16:
729 if (sgtl5000->fmt == SND_SOC_DAIFMT_RIGHT_J) 729 if (sgtl5000->fmt == SND_SOC_DAIFMT_RIGHT_J)
730 return -EINVAL; 730 return -EINVAL;
731 i2s_ctl |= SGTL5000_I2S_DLEN_16 << SGTL5000_I2S_DLEN_SHIFT; 731 i2s_ctl |= SGTL5000_I2S_DLEN_16 << SGTL5000_I2S_DLEN_SHIFT;
732 i2s_ctl |= SGTL5000_I2S_SCLKFREQ_32FS << 732 i2s_ctl |= SGTL5000_I2S_SCLKFREQ_32FS <<
733 SGTL5000_I2S_SCLKFREQ_SHIFT; 733 SGTL5000_I2S_SCLKFREQ_SHIFT;
734 break; 734 break;
735 case SNDRV_PCM_FORMAT_S20_3LE: 735 case 20:
736 i2s_ctl |= SGTL5000_I2S_DLEN_20 << SGTL5000_I2S_DLEN_SHIFT; 736 i2s_ctl |= SGTL5000_I2S_DLEN_20 << SGTL5000_I2S_DLEN_SHIFT;
737 i2s_ctl |= SGTL5000_I2S_SCLKFREQ_64FS << 737 i2s_ctl |= SGTL5000_I2S_SCLKFREQ_64FS <<
738 SGTL5000_I2S_SCLKFREQ_SHIFT; 738 SGTL5000_I2S_SCLKFREQ_SHIFT;
739 break; 739 break;
740 case SNDRV_PCM_FORMAT_S24_LE: 740 case 24:
741 i2s_ctl |= SGTL5000_I2S_DLEN_24 << SGTL5000_I2S_DLEN_SHIFT; 741 i2s_ctl |= SGTL5000_I2S_DLEN_24 << SGTL5000_I2S_DLEN_SHIFT;
742 i2s_ctl |= SGTL5000_I2S_SCLKFREQ_64FS << 742 i2s_ctl |= SGTL5000_I2S_SCLKFREQ_64FS <<
743 SGTL5000_I2S_SCLKFREQ_SHIFT; 743 SGTL5000_I2S_SCLKFREQ_SHIFT;
744 break; 744 break;
745 case SNDRV_PCM_FORMAT_S32_LE: 745 case 32:
746 if (sgtl5000->fmt == SND_SOC_DAIFMT_RIGHT_J) 746 if (sgtl5000->fmt == SND_SOC_DAIFMT_RIGHT_J)
747 return -EINVAL; 747 return -EINVAL;
748 i2s_ctl |= SGTL5000_I2S_DLEN_32 << SGTL5000_I2S_DLEN_SHIFT; 748 i2s_ctl |= SGTL5000_I2S_DLEN_32 << SGTL5000_I2S_DLEN_SHIFT;