From: Mark Brown <broonie@kernel.org>
Date: Mon, 6 Oct 2014 11:49:05 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic... 
X-Git-Tag: firefly_0821_release~176^2~2610^2~90^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=248519c00eb239adc9a4a33e9970ccfea335b83a;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic/spdif', 'asoc/topic/ssm2602' and 'asoc/topic/ssm4567' into asoc-next
---

248519c00eb239adc9a4a33e9970ccfea335b83a
diff --cc sound/soc/codecs/Kconfig
index 0563cc6cd4d0,8838838e25ed,8838838e25ed,8838838e25ed,3649e7399ec7,bc1fe4e9f8ea..5b47c550bb89
--- a/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