Merge remote-tracking branches 'asoc/topic/wm8962', 'asoc/topic/wm8974' and 'asoc...

diff --cc sound/soc/codecs/Kconfig
index ac0291c,0c9733e,e36b14c,a62b919..629ee56
--- 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
@@@@@ -59,8 -57,6 -58,7 -58,7 +59,8 @@@@@ config SND_SOC_ALL_CODEC
        select SND_SOC_CX20442 if TTY
        select SND_SOC_DA7210 if SND_SOC_I2C_AND_SPI
        select SND_SOC_DA7213 if I2C
 +++    select SND_SOC_DA7218 if I2C
 +      select SND_SOC_DA7219 if I2C
        select SND_SOC_DA732X if I2C
        select SND_SOC_DA9055 if I2C
        select SND_SOC_DMIC
@@@@@ -207,8 -195,6 -198,7 -198,7 +207,8 @@@@@ config SND_SOC_ARIZON
        default y if SND_SOC_WM5102=y
        default y if SND_SOC_WM5110=y
        default y if SND_SOC_WM8997=y
 +      default y if SND_SOC_WM8998=y
 +++    default m if SND_SOC_CS47L24=m
        default m if SND_SOC_WM5102=m
        default m if SND_SOC_WM5110=m
        default m if SND_SOC_WM8997=m
@@@@@ -455,12 -430,6 -439,9 -439,9 +455,12 @@@@@ config SND_SOC_DA721
    config SND_SOC_DA7213
            tristate
    
 +++config SND_SOC_DA7218
 +++    tristate
 +++
 +  config SND_SOC_DA7219
 +          tristate
 +  
    config SND_SOC_DA732X
            tristate
    

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

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