Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/width', 'asoc...

diff --cc sound/soc/codecs/sgtl5000.c
Simple merge

diff --cc sound/soc/codecs/sta529.c
Simple merge

diff --cc sound/soc/codecs/tas5086.c
Simple merge

diff --cc sound/soc/codecs/tlv320aic31xx.c
Simple merge

diff --cc sound/soc/codecs/tlv320aic32x4.c
Simple merge

diff --cc sound/soc/codecs/tlv320aic3x.c
index f14b551b729e390196059d26812997213fd6f8b3,00b127fe2b771bf8513aa340dd2950704efe0790,e12fafbb1e094c539663605a9bb5b5641c081f06,e12fafbb1e094c539663605a9bb5b5641c081f06,e12fafbb1e094c539663605a9bb5b5641c081f06,e12fafbb1e094c539663605a9bb5b5641c081f06..64f179ee98345f841319599c255188e14fc37767
--- 1/sound/soc/codecs/tlv320aic3x.c
--- 2/sound/soc/codecs/tlv320aic3x.c
--- 3/sound/soc/codecs/tlv320aic3x.c
--- 4/sound/soc/codecs/tlv320aic3x.c
--- 5/sound/soc/codecs/tlv320aic3x.c
--- 6/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;
        }

diff --cc sound/soc/codecs/tlv320dac33.c
Simple merge

diff --cc sound/soc/codecs/twl4030.c
Simple merge

diff --cc sound/soc/codecs/uda134x.c
Simple merge

diff --cc sound/soc/codecs/wl1273.c
Simple merge

diff --cc sound/soc/codecs/wm0010.c
Simple merge

diff --cc sound/soc/codecs/wm8350.c
Simple merge

diff --cc sound/soc/codecs/wm8903.c
Simple merge

diff --cc sound/soc/codecs/wm8904.c
Simple merge

diff --cc sound/soc/codecs/wm8960.c
Simple merge

diff --cc sound/soc/codecs/wm8962.c
Simple merge

diff --cc sound/soc/codecs/wm8994.c
Simple merge