Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for 3.6

This has been a pretty quiet release - very little activity in framework
terms, mostly just a few new drivers and updates:

- Added the ability to add and remove DAPM paths dynamically, mostly for
  reparenting on clock changes.
- New machine drivers for Marvell Brownstone, ST-Ericsson Ux500
  reference platform and ttc-dkp.
- New CPU drivers for Blackfin BF6xx SPORTs in I2S mode, Marvell MMP,
  Synopsis Designware I2S controllers, and SPEAr DMA and S/PDIF
- New CODEC drivers for Dialog DA732x, ST STA529, ST-Ericsson AB8500, TI
  Isabelle and Wolfson Microelectronics WM5102 and WM5110

1 files changed, 15 insertions, 6 deletions

diff --git a/sound/soc/blackfin/Kconfig b/sound/soc/blackfin/Kconfig
index 9f6bc55fc399..16b88f5c26e2 100644
--- a/sound/soc/blackfin/Kconfig
+++ b/sound/soc/blackfin/Kconfig
@@ -1,7 +1,8 @@
 config SND_BF5XX_I2S
-        tristate "SoC I2S Audio for the ADI BF5xx chip"
+        tristate "SoC I2S Audio for the ADI Blackfin chip"
         depends on BLACKFIN
-        select SND_BF5XX_SOC_SPORT
+        select SND_BF5XX_SOC_SPORT if !BF60x
+        select SND_BF6XX_SOC_SPORT if BF60x
         help
           Say Y or M if you want to add support for codecs attached to
           the Blackfin SPORT (synchronous serial ports) interface in I2S
@@ -9,12 +10,14 @@ config SND_BF5XX_I2S
           You will also need to select the audio interfaces to support below.
 
 config SND_BF5XX_SOC_SSM2602
-        tristate "SoC SSM2602 Audio support for BF52x ezkit"
+        tristate "SoC SSM2602 Audio Codec Add-On Card support"
         depends on SND_BF5XX_I2S && (SPI_MASTER || I2C)
-        select SND_BF5XX_SOC_I2S
+        select SND_BF5XX_SOC_I2S if !BF60x
+        select SND_BF6XX_SOC_I2S if BF60x
         select SND_SOC_SSM2602
         help
-          Say Y if you want to add support for SoC audio on BF527-EZKIT.
+          Say Y if you want to add support for the Analog Devices
+          SSM2602 Audio Codec Add-On Card.
 
 config SND_SOC_BFIN_EVAL_ADAU1701
         tristate "Support for the EVAL-ADAU1701MINIZ board on Blackfin eval boards"
@@ -162,9 +165,15 @@ config SND_BF5XX_SOC_AD1980
 config SND_BF5XX_SOC_SPORT
         tristate
 
+config SND_BF6XX_SOC_SPORT
+        tristate
+
 config SND_BF5XX_SOC_I2S
         tristate
 
+config SND_BF6XX_SOC_I2S
+        tristate
+
 config SND_BF5XX_SOC_TDM
         tristate
 
@@ -173,7 +182,7 @@ config SND_BF5XX_SOC_AC97
 
 config SND_BF5XX_SPORT_NUM
         int "Set a SPORT for Sound chip"
-        depends on (SND_BF5XX_I2S || SND_BF5XX_AC97 || SND_BF5XX_TDM)
+        depends on (SND_BF5XX_SOC_SPORT || SND_BF6XX_SOC_SPORT)
         range 0 3 if BF54x
         range 0 1 if !BF54x
         default 0