aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-02-18 15:35:08 -0500
committerMark Brown <broonie@kernel.org>2015-02-21 04:35:58 -0500
commit014c4d637604c9af2f7f2ff4fd91b725a0c58a5c (patch)
tree57d050b535e168e0dd2dbdb16b39c355471bb103
parentbfa76d49576599a4b9f9b7a71f23d73d6dcff735 (diff)
ASoC: Samsung: add missing I2C/SPI dependencies
A few sound drivers for the samsung platforms are missing dependencies on I2C or SPI, which can lead to build errors like codecs/rt5631.c:1737:1: warning: data definition has no type or storage class 31_i2c_driver); codecs/rt5631.c:1737:1: error: type defaults to 'int' in declaration of 'module_i2c_driver' [-Werror=implicit-int] codecs/rt5631.c:1737:1: warning: parameter names (without types) in function declaration codecs/rt5631.c:1726:26: warning: 'rt5631_i2c_driver' defined but not used [-Wunused-variable] I have gone through all the ones that did not already have an I2C dependency and added the ones that I found missing, namely arndale, odroid-x2, littlemill, bells and speyside and this patch adds all the dependencies. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/samsung/Kconfig10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index fc67f97f19f6..e0c4a4ec4280 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -185,7 +185,7 @@ config SND_SOC_SMDK_WM8994_PCM
185 185
186config SND_SOC_SPEYSIDE 186config SND_SOC_SPEYSIDE
187 tristate "Audio support for Wolfson Speyside" 187 tristate "Audio support for Wolfson Speyside"
188 depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 188 depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && I2C && SPI_MASTER
189 select SND_SAMSUNG_I2S 189 select SND_SAMSUNG_I2S
190 select SND_SOC_WM8996 190 select SND_SOC_WM8996
191 select SND_SOC_WM9081 191 select SND_SOC_WM9081
@@ -200,7 +200,7 @@ config SND_SOC_TOBERMORY
200 200
201config SND_SOC_BELLS 201config SND_SOC_BELLS
202 tristate "Audio support for Wolfson Bells" 202 tristate "Audio support for Wolfson Bells"
203 depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && MFD_ARIZONA 203 depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && MFD_ARIZONA && I2C && SPI_MASTER
204 select SND_SAMSUNG_I2S 204 select SND_SAMSUNG_I2S
205 select SND_SOC_WM5102 205 select SND_SOC_WM5102
206 select SND_SOC_WM5110 206 select SND_SOC_WM5110
@@ -217,7 +217,7 @@ config SND_SOC_LOWLAND
217 217
218config SND_SOC_LITTLEMILL 218config SND_SOC_LITTLEMILL
219 tristate "Audio support for Wolfson Littlemill" 219 tristate "Audio support for Wolfson Littlemill"
220 depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 220 depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && I2C
221 select SND_SAMSUNG_I2S 221 select SND_SAMSUNG_I2S
222 select MFD_WM8994 222 select MFD_WM8994
223 select SND_SOC_WM8994 223 select SND_SOC_WM8994
@@ -234,7 +234,7 @@ config SND_SOC_SNOW
234 234
235config SND_SOC_ODROIDX2 235config SND_SOC_ODROIDX2
236 tristate "Audio support for Odroid-X2 and Odroid-U3" 236 tristate "Audio support for Odroid-X2 and Odroid-U3"
237 depends on SND_SOC_SAMSUNG 237 depends on SND_SOC_SAMSUNG && I2C
238 select SND_SOC_MAX98090 238 select SND_SOC_MAX98090
239 select SND_SAMSUNG_I2S 239 select SND_SAMSUNG_I2S
240 help 240 help
@@ -242,6 +242,6 @@ config SND_SOC_ODROIDX2
242 242
243config SND_SOC_ARNDALE_RT5631_ALC5631 243config SND_SOC_ARNDALE_RT5631_ALC5631
244 tristate "Audio support for RT5631(ALC5631) on Arndale Board" 244 tristate "Audio support for RT5631(ALC5631) on Arndale Board"
245 depends on SND_SOC_SAMSUNG 245 depends on SND_SOC_SAMSUNG && I2C
246 select SND_SAMSUNG_I2S 246 select SND_SAMSUNG_I2S
247 select SND_SOC_RT5631 247 select SND_SOC_RT5631