Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

diff --cc sound/soc/codecs/Kconfig
index 663840e677663c5b8190545ae90e81b1ece96b64,167a5ce06cdf26d4393cd0225afcc9b2ef515c7e..a5cfa78eb166b6834e54191ea49bfbd350f7d62f
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -28,8 -33,8 +33,9 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_WM8350 if MFD_WM8350
        select SND_SOC_WM8400 if MFD_WM8400
        select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI
+       select SND_SOC_WM8523 if I2C
        select SND_SOC_WM8580 if I2C
 +      select SND_SOC_WM8711 if I2C
        select SND_SOC_WM8728 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8731 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8750 if SND_SOC_I2C_AND_SPI

diff --cc sound/soc/codecs/Makefile
index 19950e998b6b1ac56a475572a9bb887f06963832,fbab43bbe3a7408daab236e9a294d8d490daba79..711d8f5887de6b6c09c189545bd351688513b6f2
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -16,8 -21,8 +21,9 @@@ snd-soc-uda1380-objs := uda1380.
  snd-soc-wm8350-objs := wm8350.o
  snd-soc-wm8400-objs := wm8400.o
  snd-soc-wm8510-objs := wm8510.o
+ snd-soc-wm8523-objs := wm8523.o
  snd-soc-wm8580-objs := wm8580.o
 +snd-soc-wm8711-objs := wm8711.o
  snd-soc-wm8728-objs := wm8728.o
  snd-soc-wm8731-objs := wm8731.o
  snd-soc-wm8750-objs := wm8750.o
@@@ -48,8 -70,8 +71,9 @@@ obj-$(CONFIG_SND_SOC_UDA1380) += snd-so
  obj-$(CONFIG_SND_SOC_WM8350)  += snd-soc-wm8350.o
  obj-$(CONFIG_SND_SOC_WM8400)  += snd-soc-wm8400.o
  obj-$(CONFIG_SND_SOC_WM8510)  += snd-soc-wm8510.o
+ obj-$(CONFIG_SND_SOC_WM8523)  += snd-soc-wm8523.o
  obj-$(CONFIG_SND_SOC_WM8580)  += snd-soc-wm8580.o
 +obj-$(CONFIG_SND_SOC_WM8711)  += snd-soc-wm8711.o
  obj-$(CONFIG_SND_SOC_WM8728)  += snd-soc-wm8728.o
  obj-$(CONFIG_SND_SOC_WM8731)  += snd-soc-wm8731.o
  obj-$(CONFIG_SND_SOC_WM8750)  += snd-soc-wm8750.o