Merge remote-tracking branches 'asoc/topic/hisilicon', 'asoc/topic/max98373', 'asoc...

diff --combined sound/soc/codecs/Kconfig
index dda8c01170b3004d9c74735e6c684dcd63e59dd9,a42ddbc93f3df1e52bd3f8f188779ddfe198ed1b,80af1f4d3097183fcad1289411c3b81692ffcb69,a42ddbc93f3df1e52bd3f8f188779ddfe198ed1b,a42ddbc93f3df1e52bd3f8f188779ddfe198ed1b..89ac249f6e24f1fd338626cfd25bdb2c2a6f8a80
--- 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
@@@@@@ -95,6 -95,6 -95,7 -95,6 -95,6 +95,7 @@@@@@ config SND_SOC_ALL_CODEC
        select SND_SOC_MAX98925 if I2C
        select SND_SOC_MAX98926 if I2C
        select SND_SOC_MAX98927 if I2C
++ ++   select SND_SOC_MAX98373 if I2C
        select SND_SOC_MAX9850 if I2C
        select SND_SOC_MAX9860 if I2C
        select SND_SOC_MAX9768 if I2C
@@@@@@ -109,8 -109,6 -110,6 -109,6 -109,6 +110,8 @@@@@@
        select SND_SOC_PCM1681 if I2C
        select SND_SOC_PCM179X_I2C if I2C
        select SND_SOC_PCM179X_SPI if SPI_MASTER
 ++++   select SND_SOC_PCM186X_I2C if I2C
 ++++   select SND_SOC_PCM186X_SPI if SPI_MASTER
        select SND_SOC_PCM3008
        select SND_SOC_PCM3168A_I2C if I2C
        select SND_SOC_PCM3168A_SPI if SPI_MASTER
@@@@@@ -625,6 -623,6 -624,10 -623,6 -623,6 +626,10 @@@@@@ config SND_SOC_MAX9892
        tristate "Maxim Integrated MAX98927 Speaker Amplifier"
        depends on I2C
     
++ ++config SND_SOC_MAX98373
++ ++   tristate "Maxim Integrated MAX98373 Speaker Amplifier"
++ ++   depends on I2C
++ ++
     config SND_SOC_MAX9850
        tristate
     
@@@@@@ -663,21 -661,6 -666,6 -661,6 -661,6 +668,21 @@@@@@ config SND_SOC_PCM179X_SP
          Enable support for Texas Instruments PCM179x CODEC.
          Select this if your PCM179x is connected via an SPI bus.
     
 ++++config SND_SOC_PCM186X
 ++++   tristate
 ++++
 ++++config SND_SOC_PCM186X_I2C
 ++++   tristate "Texas Instruments PCM186x CODECs - I2C"
 ++++   depends on I2C
 ++++   select SND_SOC_PCM186X
 ++++   select REGMAP_I2C
 ++++
 ++++config SND_SOC_PCM186X_SPI
 ++++   tristate "Texas Instruments PCM186x CODECs - SPI"
 ++++   depends on SPI_MASTER
 ++++   select SND_SOC_PCM186X
 ++++   select REGMAP_SPI
 ++++
     config SND_SOC_PCM3008
            tristate
     

diff --combined sound/soc/codecs/Makefile
index 146e48a60098436518d695bc1527cc1c2e92d221,0001069ce2a7e2f346cd7775f144864282d622e8,31a620b5e8a3faf3ecb8501548c5e26e09c15a1f,0001069ce2a7e2f346cd7775f144864282d622e8,0001069ce2a7e2f346cd7775f144864282d622e8..cc25c6a41052a9133c8467ef71f45a0005d01a0f
--- 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
@@@@@@ -90,6 -90,6 -90,7 -90,6 -90,6 +90,7 @@@@@@ snd-soc-max9867-objs := max9867.
     snd-soc-max98925-objs := max98925.o
     snd-soc-max98926-objs := max98926.o
     snd-soc-max98927-objs := max98927.o
++ ++snd-soc-max98373-objs := max98373.o
     snd-soc-max9850-objs := max9850.o
     snd-soc-max9860-objs := max9860.o
     snd-soc-mc13783-objs := mc13783.o
@@@@@@ -105,9 -105,6 -106,6 -105,6 -105,6 +106,9 @@@@@@ snd-soc-pcm1681-objs := pcm1681.
     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-pcm186x-objs := pcm186x.o
 ++++snd-soc-pcm186x-i2c-objs := pcm186x-i2c.o
 ++++snd-soc-pcm186x-spi-objs := pcm186x-spi.o
     snd-soc-pcm3008-objs := pcm3008.o
     snd-soc-pcm3168a-objs := pcm3168a.o
     snd-soc-pcm3168a-i2c-objs := pcm3168a-i2c.o
@@@@@@ -333,6 -330,6 -331,7 -330,6 -330,6 +334,7 @@@@@@ obj-$(CONFIG_SND_SOC_MAX9867)   += snd-so
     obj-$(CONFIG_SND_SOC_MAX98925)     += snd-soc-max98925.o
     obj-$(CONFIG_SND_SOC_MAX98926)     += snd-soc-max98926.o
     obj-$(CONFIG_SND_SOC_MAX98927)     += snd-soc-max98927.o
++ ++obj-$(CONFIG_SND_SOC_MAX98373)     += snd-soc-max98373.o
     obj-$(CONFIG_SND_SOC_MAX9850)      += snd-soc-max9850.o
     obj-$(CONFIG_SND_SOC_MAX9860)      += snd-soc-max9860.o
     obj-$(CONFIG_SND_SOC_MC13783)      += snd-soc-mc13783.o
@@@@@@ -348,9 -345,6 -347,6 -345,6 -345,6 +350,9 @@@@@@ obj-$(CONFIG_SND_SOC_PCM1681)   += snd-so
     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_PCM186X)      += snd-soc-pcm186x.o
 ++++obj-$(CONFIG_SND_SOC_PCM186X_I2C)  += snd-soc-pcm186x-i2c.o
 ++++obj-$(CONFIG_SND_SOC_PCM186X_SPI)  += snd-soc-pcm186x-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