Merge remote-tracking branches 'asoc/topic/cache', 'asoc/topic/cs42l56' and 'asoc...

diff --cc sound/soc/codecs/Kconfig
index 74cbf29e3ed5c95323eca8ffa675666729066074,f0e8401378873721f0e69e7fe338fe00afe29fb5,755372509cc8795067784757aa640f572d12a4ab,f0e8401378873721f0e69e7fe338fe00afe29fb5..99e0bdcb3290dce88314af74d8e50abc15be7564
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
--- 3/sound/soc/codecs/Kconfig
--- 4/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@ -223,38 -215,9 -216,9 -215,9 +224,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/cs42l51.c
Simple merge

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

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