Merge branch 'topic/ics43432' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc sound/soc/codecs/Kconfig
index 1b7c49214c256e4f04a50f2b278230c3f2bde185,1bb6446dce5357595453ddc9f7c85669279a2c1e..c56cbe1ea649d0edbe10917f97aebef269e24021
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -62,7 -62,7 +62,8 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_BT_SCO
        select SND_SOC_ES8328_SPI if SPI_MASTER
        select SND_SOC_ES8328_I2C if I2C
 +      select SND_SOC_GTM601
+       select SND_SOC_ICS43432
        select SND_SOC_ISABELLE if I2C
        select SND_SOC_JZ4740_CODEC
        select SND_SOC_LM4857 if I2C
@@@ -447,9 -447,9 +448,12 @@@ config SND_SOC_ES8328_SP
        tristate
        select SND_SOC_ES8328
  
 +config SND_SOC_GTM601
 +      tristate 'GTM601 UMTS modem audio codec'
 +
+ config SND_SOC_ICS43432
+       tristate
+ 
  config SND_SOC_ISABELLE
          tristate
  

diff --cc sound/soc/codecs/Makefile
index 365529d284651eb31ca8bb30cb4c88b0be284043,5a19a670a82b65c3cc93523de02409f0b61100ea..39a839a85acd6a189ec4faafe73af2b2b2596dfe
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -55,7 -55,7 +55,8 @@@ snd-soc-dmic-objs := dmic.
  snd-soc-es8328-objs := es8328.o
  snd-soc-es8328-i2c-objs := es8328-i2c.o
  snd-soc-es8328-spi-objs := es8328-spi.o
 +snd-soc-gtm601-objs := gtm601.o
+ snd-soc-ics43432-objs := ics43432.o
  snd-soc-isabelle-objs := isabelle.o
  snd-soc-jz4740-codec-objs := jz4740.o
  snd-soc-l3-objs := l3.o
@@@ -243,7 -243,7 +244,8 @@@ obj-$(CONFIG_SND_SOC_DMIC) += snd-soc-d
  obj-$(CONFIG_SND_SOC_ES8328)  += snd-soc-es8328.o
  obj-$(CONFIG_SND_SOC_ES8328_I2C)+= snd-soc-es8328-i2c.o
  obj-$(CONFIG_SND_SOC_ES8328_SPI)+= snd-soc-es8328-spi.o
 +obj-$(CONFIG_SND_SOC_GTM601)    += snd-soc-gtm601.o
+ obj-$(CONFIG_SND_SOC_ICS43432)        += snd-soc-ics43432.o
  obj-$(CONFIG_SND_SOC_ISABELLE)        += snd-soc-isabelle.o
  obj-$(CONFIG_SND_SOC_JZ4740_CODEC)    += snd-soc-jz4740-codec.o
  obj-$(CONFIG_SND_SOC_L3)      += snd-soc-l3.o