Merge remote-tracking branches 'asoc/topic/ad1980', 'asoc/topic/adau', 'asoc/topic...

diff --cc sound/soc/codecs/Kconfig
index c7b853f520cf17454a80d0ab81e671cccf972609,f0e8401378873721f0e69e7fe338fe00afe29fb5,dd5deea9221a06f7a6ba9cce58979329012fa8d2,f0e8401378873721f0e69e7fe338fe00afe29fb5,f0e8401378873721f0e69e7fe338fe00afe29fb5,f0e8401378873721f0e69e7fe338fe00afe29fb5,808e964d7580e345efb1877d70e18aa2a82ceda4,f0e8401378873721f0e69e7fe338fe00afe29fb5,f0e8401378873721f0e69e7fe338fe00afe29fb5..74cbf29e3ed5c95323eca8ffa675666729066074
--- 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
--- 6/sound/soc/codecs/Kconfig
--- 7/sound/soc/codecs/Kconfig
--- 8/sound/soc/codecs/Kconfig
--- 9/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@@@@@ -216,9 -215,9 -222,38 -215,9 -215,9 -215,9 -215,9 -215,9 -215,9 +223,38 @@@@@@@@@@ config SND_SOC_ADAU170
                depends on I2C
                select SND_SOC_SIGMADSP
         
-- ------config SND_SOC_ADAU1373
++ ++++++config SND_SOC_ADAU17X1
++ ++++++       tristate
++ ++++++       select SND_SOC_SIGMADSP
++ ++++++
++ ++++++config SND_SOC_ADAU1761
+     +         tristate
++ ++++++       select SND_SOC_ADAU17X1
++ ++++++
++ ++++++config SND_SOC_ADAU1761_I2C
++ +++ ++       tristate
++ ++++++       select SND_SOC_ADAU1761
++ ++++++       select REGMAP_I2C
++ ++++++
++ ++++++config SND_SOC_ADAU1761_SPI
++ ++++++       tristate
++ ++++++       select SND_SOC_ADAU1761
++ ++++++       select REGMAP_SPI
++ ++++++
++ ++++++config SND_SOC_ADAU1781
++ ++++++       select SND_SOC_ADAU17X1
 + ++++++       tristate
 + ++++++
++ ++++++config SND_SOC_ADAU1781_I2C
++ ++++++       tristate
++ ++++++       select SND_SOC_ADAU1781
++ ++++++       select REGMAP_I2C
++ ++++++
++ ++++++config SND_SOC_ADAU1781_SPI
++ ++++++       tristate
++ ++++++       select SND_SOC_ADAU1781
++ ++++++       select REGMAP_SPI
+        
         config SND_SOC_ADAU1977
                tristate
         

diff --cc sound/soc/codecs/Makefile
Simple merge

diff --cc sound/soc/codecs/alc5623.c
Simple merge

diff --cc sound/soc/codecs/wm5110.c
Simple merge

diff --cc sound/soc/codecs/wm_adsp.c
Simple merge