Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus

diff --combined sound/soc/samsung/Kconfig
index 3cebf6ca03dfb91891cd6e6d5eb51649b504c0b1,e0c4a4ec42809a08db3d9bcf4ddd51e24d32dd35..0632a36852c8476416f8fcb78d625abb98d658cf
--- 1/sound/soc/samsung/Kconfig
--- 2/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@@ -54,7 -54,7 +54,7 @@@ config SND_SOC_SAMSUNG_JIVE_WM875
  config SND_SOC_SAMSUNG_SMDK_WM8580
        tristate "SoC I2S Audio support for WM8580 on SMDK"
        depends on SND_SOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110)
 -      depends on REGMAP_I2C
 +      depends on I2C
        select SND_SOC_WM8580
        select SND_SAMSUNG_I2S
        help
@@@ -146,6 -146,17 +146,6 @@@ config SND_SOC_SMART
        select SND_SAMSUNG_I2S
        select SND_SOC_WM8750
  
 -config SND_SOC_GONI_AQUILA_WM8994
 -      tristate "SoC I2S Audio support for AQUILA/GONI - WM8994"
 -      depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA)
 -      depends on I2C=y
 -      select SND_SAMSUNG_I2S
 -      select MFD_WM8994
 -      select SND_SOC_WM8994
 -      help
 -        Say Y if you want to add support for SoC audio on goni or aquila
 -        with the WM8994.
 -
  config SND_SOC_SAMSUNG_SMDK_SPDIF
        tristate "SoC S/PDIF Audio support for SMDK"
        depends on SND_SOC_SAMSUNG
@@@ -156,7 -167,7 +156,7 @@@
  config SND_SOC_SMDK_WM8580_PCM
        tristate "SoC PCM Audio support for WM8580 on SMDK"
        depends on SND_SOC_SAMSUNG && (MACH_SMDKV210 || MACH_SMDKC110)
 -      depends on REGMAP_I2C
 +      depends on I2C
        select SND_SOC_WM8580
        select SND_SAMSUNG_PCM
        help
@@@ -174,7 -185,7 +174,7 @@@ config SND_SOC_SMDK_WM8994_PC
  
  config SND_SOC_SPEYSIDE
        tristate "Audio support for Wolfson Speyside"
-       depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
+       depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && I2C && SPI_MASTER
        select SND_SAMSUNG_I2S
        select SND_SOC_WM8996
        select SND_SOC_WM9081
@@@ -189,7 -200,7 +189,7 @@@ config SND_SOC_TOBERMOR
  
  config SND_SOC_BELLS
        tristate "Audio support for Wolfson Bells"
-       depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && MFD_ARIZONA
+       depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && MFD_ARIZONA && I2C && SPI_MASTER
        select SND_SAMSUNG_I2S
        select SND_SOC_WM5102
        select SND_SOC_WM5110
@@@ -206,7 -217,7 +206,7 @@@ config SND_SOC_LOWLAN
  
  config SND_SOC_LITTLEMILL
        tristate "Audio support for Wolfson Littlemill"
-       depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
+       depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && I2C
        select SND_SAMSUNG_I2S
        select MFD_WM8994
        select SND_SOC_WM8994
@@@ -223,7 -234,7 +223,7 @@@ config SND_SOC_SNO
  
  config SND_SOC_ODROIDX2
        tristate "Audio support for Odroid-X2 and Odroid-U3"
-       depends on SND_SOC_SAMSUNG
+       depends on SND_SOC_SAMSUNG && I2C
        select SND_SOC_MAX98090
        select SND_SAMSUNG_I2S
        help
@@@ -231,6 -242,6 +231,6 @@@
  
  config SND_SOC_ARNDALE_RT5631_ALC5631
          tristate "Audio support for RT5631(ALC5631) on Arndale Board"
-         depends on SND_SOC_SAMSUNG
+         depends on SND_SOC_SAMSUNG && I2C
          select SND_SAMSUNG_I2S
          select SND_SOC_RT5631