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

diff --cc sound/soc/codecs/Kconfig
index 1a8ff1e541efd6afd83dc266a200dbf4e7ea5dbd,a79c0d141f9015772aed4c270d68c0369e779553..f0e8401378873721f0e69e7fe338fe00afe29fb5
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -301,9 -253,17 +302,18 @@@ config SND_SOC_CS4270_VD33_ERRAT
        depends on SND_SOC_CS4270
  
  config SND_SOC_CS4271
 -      tristate
 +      tristate "Cirrus Logic CS4271 CODEC"
 +      depends on SND_SOC_I2C_AND_SPI
  
+ config SND_SOC_CS42XX8
+       tristate
+ 
+ config SND_SOC_CS42XX8_I2C
+       tristate "Cirrus Logic CS42448/CS42888 CODEC (I2C)"
+       depends on I2C
+       select SND_SOC_CS42XX8
+       select REGMAP_I2C
+ 
  config SND_SOC_CX20442
        tristate
        depends on TTY

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