mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 20:02:17 +00:00
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>
This commit is contained in:
parent
bfa76d4957
commit
014c4d6376
1 changed files with 5 additions and 5 deletions
|
@ -185,7 +185,7 @@ config SND_SOC_SMDK_WM8994_PCM
|
||||||
|
|
||||||
config SND_SOC_SPEYSIDE
|
config SND_SOC_SPEYSIDE
|
||||||
tristate "Audio support for Wolfson 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_SAMSUNG_I2S
|
||||||
select SND_SOC_WM8996
|
select SND_SOC_WM8996
|
||||||
select SND_SOC_WM9081
|
select SND_SOC_WM9081
|
||||||
|
@ -200,7 +200,7 @@ config SND_SOC_TOBERMORY
|
||||||
|
|
||||||
config SND_SOC_BELLS
|
config SND_SOC_BELLS
|
||||||
tristate "Audio support for Wolfson 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_SAMSUNG_I2S
|
||||||
select SND_SOC_WM5102
|
select SND_SOC_WM5102
|
||||||
select SND_SOC_WM5110
|
select SND_SOC_WM5110
|
||||||
|
@ -217,7 +217,7 @@ config SND_SOC_LOWLAND
|
||||||
|
|
||||||
config SND_SOC_LITTLEMILL
|
config SND_SOC_LITTLEMILL
|
||||||
tristate "Audio support for Wolfson 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 SND_SAMSUNG_I2S
|
||||||
select MFD_WM8994
|
select MFD_WM8994
|
||||||
select SND_SOC_WM8994
|
select SND_SOC_WM8994
|
||||||
|
@ -234,7 +234,7 @@ config SND_SOC_SNOW
|
||||||
|
|
||||||
config SND_SOC_ODROIDX2
|
config SND_SOC_ODROIDX2
|
||||||
tristate "Audio support for Odroid-X2 and Odroid-U3"
|
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_SOC_MAX98090
|
||||||
select SND_SAMSUNG_I2S
|
select SND_SAMSUNG_I2S
|
||||||
help
|
help
|
||||||
|
@ -242,6 +242,6 @@ config SND_SOC_ODROIDX2
|
||||||
|
|
||||||
config SND_SOC_ARNDALE_RT5631_ALC5631
|
config SND_SOC_ARNDALE_RT5631_ALC5631
|
||||||
tristate "Audio support for RT5631(ALC5631) on Arndale Board"
|
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_SAMSUNG_I2S
|
||||||
select SND_SOC_RT5631
|
select SND_SOC_RT5631
|
||||||
|
|
Loading…
Reference in a new issue