Merge remote-tracking branches 'asoc/topic/fsl-sai', 'asoc/topic/max98926', 'asoc...

diff --cc sound/soc/codecs/Kconfig
index 3a8fcf13200fac227f65d3a426ec0a99801c1744,cfdafc4c11ea9a64c465eef6d9ac4ed3520c159a,ebaaa51823ef22ac13936584c59bf17b9a2f9ca2,cfdafc4c11ea9a64c465eef6d9ac4ed3520c159a,50693c867e71d06a2b6ccebf0d2f303c1ef9a0f5..f0bcf96c654c5ca34128184e5f0157fe972287bb
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
--- 3/sound/soc/codecs/Kconfig
--- 4/sound/soc/codecs/Kconfig
--- 5/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@ -87,11 -83,8 -88,10 -83,8 -87,10 +88,11 @@@@@@ config SND_SOC_ALL_CODEC
        select SND_SOC_ML26124 if I2C
        select SND_SOC_NAU8825 if I2C
        select SND_SOC_PCM1681 if I2C
 - -    select SND_SOC_PCM1792A if SPI_MASTER
  - -   select SND_SOC_PCM179X if SPI_MASTER
 ++++   select SND_SOC_PCM179X_I2C if I2C
 ++++   select SND_SOC_PCM179X_SPI if SPI_MASTER
        select SND_SOC_PCM3008
 + +    select SND_SOC_PCM3168A_I2C if I2C
 + +    select SND_SOC_PCM3168A_SPI if SPI_MASTER
        select SND_SOC_PCM512x_I2C if I2C
        select SND_SOC_PCM512x_SPI if SPI_MASTER
        select SND_SOC_RT286 if I2C
@@@@@@ -527,24 -499,9 -530,9 -499,9 -526,9 +531,24 @@@@@@ config SND_SOC_PCM168
        tristate "Texas Instruments PCM1681 CODEC"
        depends on I2C
     
 - - config SND_SOC_PCM1792A
 - -    tristate "Texas Instruments PCM1792A CODEC"
 + + config SND_SOC_PCM179X
  - -   tristate "Texas Instruments PCM179X CODEC"
 ++++   tristate
 ++++
 ++++config SND_SOC_PCM179X_I2C
 ++++   tristate "Texas Instruments PCM179X CODEC (I2C)"
 ++++   depends on I2C
 ++++   select SND_SOC_PCM179X
 ++++   help
 ++++     Enable support for Texas Instruments PCM179x CODEC.
 ++++     Select this if your PCM179x is connected via an I2C bus.
 ++++
 ++++config SND_SOC_PCM179X_SPI
 ++++   tristate "Texas Instruments PCM179X CODEC (SPI)"
        depends on SPI_MASTER
 ++++   select SND_SOC_PCM179X
 ++++   help
 ++++     Enable support for Texas Instruments PCM179x CODEC.
 ++++     Select this if your PCM179x is connected via an SPI bus.
     
     config SND_SOC_PCM3008
            tristate

diff --cc sound/soc/codecs/Makefile
index 9acd777a7a98551e4c5f7c417fe313fdf46d8ef8,f632fc42f59f08d9d6c72f6aac045d9fe28176a1,16c014a46ae8292b6b42a37ca512de7363783013,f632fc42f59f08d9d6c72f6aac045d9fe28176a1,d44f7d347183cbe9a0aca29826b9c6477c52d6c4..897ca623ea4502954dced70c6a751b9492082174
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
--- 3/sound/soc/codecs/Makefile
--- 4/sound/soc/codecs/Makefile
--- 5/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@@@@ -80,13 -76,8 -81,11 -76,8 -80,11 +81,13 @@@@@@ snd-soc-mc13783-objs := mc13783.
     snd-soc-ml26124-objs := ml26124.o
     snd-soc-nau8825-objs := nau8825.o
     snd-soc-pcm1681-objs := pcm1681.o
 - - snd-soc-pcm1792a-codec-objs := pcm1792a.o
 + + snd-soc-pcm179x-codec-objs := pcm179x.o
 ++++snd-soc-pcm179x-i2c-objs := pcm179x-i2c.o
 ++++snd-soc-pcm179x-spi-objs := pcm179x-spi.o
     snd-soc-pcm3008-objs := pcm3008.o
 + + snd-soc-pcm3168a-objs := pcm3168a.o
 + + snd-soc-pcm3168a-i2c-objs := pcm3168a-i2c.o
 + + snd-soc-pcm3168a-spi-objs := pcm3168a-spi.o
     snd-soc-pcm512x-objs := pcm512x.o
     snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o
     snd-soc-pcm512x-spi-objs := pcm512x-spi.o
@@@@@@ -286,13 -271,8 -286,11 -271,8 -284,11 +288,13 @@@@@@ obj-$(CONFIG_SND_SOC_MC13783)       += snd-so
     obj-$(CONFIG_SND_SOC_ML26124)      += snd-soc-ml26124.o
     obj-$(CONFIG_SND_SOC_NAU8825)   += snd-soc-nau8825.o
     obj-$(CONFIG_SND_SOC_PCM1681)      += snd-soc-pcm1681.o
 - - obj-$(CONFIG_SND_SOC_PCM1792A)     += snd-soc-pcm1792a-codec.o
 + + obj-$(CONFIG_SND_SOC_PCM179X)      += snd-soc-pcm179x-codec.o
 ++++obj-$(CONFIG_SND_SOC_PCM179X_I2C)  += snd-soc-pcm179x-i2c.o
 ++++obj-$(CONFIG_SND_SOC_PCM179X_SPI)  += snd-soc-pcm179x-spi.o
     obj-$(CONFIG_SND_SOC_PCM3008)      += snd-soc-pcm3008.o
 + + obj-$(CONFIG_SND_SOC_PCM3168A)     += snd-soc-pcm3168a.o
 + + obj-$(CONFIG_SND_SOC_PCM3168A_I2C) += snd-soc-pcm3168a-i2c.o
 + + obj-$(CONFIG_SND_SOC_PCM3168A_SPI) += snd-soc-pcm3168a-spi.o
     obj-$(CONFIG_SND_SOC_PCM512x)      += snd-soc-pcm512x.o
     obj-$(CONFIG_SND_SOC_PCM512x_I2C)  += snd-soc-pcm512x-i2c.o
     obj-$(CONFIG_SND_SOC_PCM512x_SPI)  += snd-soc-pcm512x-spi.o

diff --cc sound/soc/fsl/fsl_sai.c
index fef264d27fd3378d726a77209647ccc8098ec6a0,4919de9684eb8d10752ad2592534533e50e2e2e0,fef264d27fd3378d726a77209647ccc8098ec6a0,a4435f5e3be910447f9168b4708d19140f3c1f4f,fef264d27fd3378d726a77209647ccc8098ec6a0..0754df771e3b4c8a945c29e8c3c99f5c23403719
--- 1/sound/soc/fsl/fsl_sai.c
--- 2/sound/soc/fsl/fsl_sai.c
--- 3/sound/soc/fsl/fsl_sai.c
--- 4/sound/soc/fsl/fsl_sai.c
--- 5/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@@@@@ -404,21 -405,21 -404,21 -381,13 -404,21 +405,21 @@@@@@ static int fsl_sai_hw_params(struct snd
        struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
        bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
        unsigned int channels = params_channels(params);
 - -    u32 word_width = snd_pcm_format_width(params_format(params));
 + +    u32 word_width = params_width(params);
        u32 val_cr4 = 0, val_cr5 = 0;
   +    u32 slots = (channels == 1) ? 2 : channels;
   +    u32 slot_width = word_width;
        int ret;
     
   +    if (sai->slots)
   +            slots = sai->slots;
   + 
   +    if (sai->slot_width)
   +            slot_width = sai->slot_width;
   + 
        if (!sai->is_slave_mode) {
                ret = fsl_sai_set_bclk(cpu_dai, tx,
   -                    2 * word_width * params_rate(params));
   +                            slots * slot_width * params_rate(params));
                if (ret)
                        return ret;
     

diff --cc sound/soc/mxs/mxs-saif.c
Simple merge