Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic...

diff --cc sound/soc/codecs/Kconfig
index 0563cc6cd4d041caaf0de9b9213cc50dcaf7c29f,8838838e25ed89a9525e80b86cd92575701a75d9,8838838e25ed89a9525e80b86cd92575701a75d9,8838838e25ed89a9525e80b86cd92575701a75d9,3649e7399ec7fb5a79b957dbe9d616a9c75dd239,bc1fe4e9f8ea760614379684c5af3a565c4d1707..5b47c550bb89d1d0e80133660069cefa9891cfe9
--- 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
+++ b/sound/soc/codecs/Kconfig
@@@@@@@ -540,13 -520,13 -520,13 -520,13 -520,17 -521,17 +541,21 @@@@@@@ config SND_SOC_SSM260
        tristate
      
      config SND_SOC_SSM2602_SPI
++++ +  tristate "Analog Devices SSM2602 CODEC - SPI"
++++ +  depends on SPI_MASTER
        select SND_SOC_SSM2602
---- -  tristate
++++ +  select REGMAP_SPI
      
      config SND_SOC_SSM2602_I2C
++++ +  tristate "Analog Devices SSM2602 CODEC - I2C"
++++ +  depends on I2C
        select SND_SOC_SSM2602
---- -  tristate
++++ +  select REGMAP_I2C
++++  
+++++ config SND_SOC_SSM4567
+++++   tristate "Analog Devices ssm4567 amplifier driver support"
+++++   depends on I2C
    + 
      config SND_SOC_STA32X
        tristate
      

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

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

diff --cc sound/soc/fsl/fsl_spdif.c
Simple merge