Merge remote-tracking branch 'asoc/topic/pcm186x' into asoc-next

diff --combined sound/soc/codecs/Kconfig
index 3ed2b985b38b70fdeaf4b0ae1c4d4ae11e7bb7cb,dda8c01170b3004d9c74735e6c684dcd63e59dd9..f3c7758cc491e77bf2d3f97fc03bcae09480f0c2
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -109,6 -109,8 +109,8 @@@ config SND_SOC_ALL_CODEC
        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
@@@ -133,6 -135,7 +135,6 @@@
        select SND_SOC_SGTL5000 if I2C
        select SND_SOC_SI476X if MFD_SI476X_CORE
        select SND_SOC_SIRF_AUDIO_CODEC
 -      select SND_SOC_SN95031 if INTEL_SCU_IPC
        select SND_SOC_SPDIF
        select SND_SOC_SSM2518 if I2C
        select SND_SOC_SSM2602_SPI if SPI_MASTER
@@@ -660,6 -663,21 +662,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
  
@@@ -817,6 -835,9 +834,6 @@@ config SND_SOC_SIRF_AUDIO_CODE
        tristate "SiRF SoC internal audio codec"
        select REGMAP_MMIO
  
 -config SND_SOC_SN95031
 -      tristate
 -
  config SND_SOC_SPDIF
        tristate "S/PDIF CODEC"
  

diff --combined sound/soc/codecs/Makefile
index ae25cbe85d1d92abc82936e10f4cbe4ecba76f4a,146e48a60098436518d695bc1527cc1c2e92d221..d930d067f60253a1ff5047e55238ec467df0a33a
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -105,6 -105,9 +105,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
@@@ -140,6 -143,7 +143,6 @@@ snd-soc-sigmadsp-i2c-objs := sigmadsp-i
  snd-soc-sigmadsp-regmap-objs := sigmadsp-regmap.o
  snd-soc-si476x-objs := si476x.o
  snd-soc-sirf-audio-codec-objs := sirf-audio-codec.o
 -snd-soc-sn95031-objs := sn95031.o
  snd-soc-spdif-tx-objs := spdif_transmitter.o
  snd-soc-spdif-rx-objs := spdif_receiver.o
  snd-soc-ssm2518-objs := ssm2518.o
@@@ -344,6 -348,9 +347,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