From: Mark Brown <broonie@linaro.org>
Date: Mon, 4 Aug 2014 15:32:18 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/width', 'asoc... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e99a866c4c6749eb3754e61d43eb18ef32e3556a;p=openwrt%2Fstaging%2Fblogic.git

Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/width', 'asoc/topic/wm0010', 'asoc/topic/wm8904' and 'asoc/topic/wm8962' into asoc-next
---

e99a866c4c6749eb3754e61d43eb18ef32e3556a
diff --cc sound/soc/codecs/tlv320aic3x.c
index f14b551b729e,00b127fe2b77,e12fafbb1e09,e12fafbb1e09,e12fafbb1e09,e12fafbb1e09..64f179ee9834
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@@@@@@ -873,16 -873,16 -873,16 -873,16 -873,16 -873,16 +873,16 @@@@@@@ static int aic3x_hw_params(struct snd_p
      
      	/* 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;
      	}