Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d21e1b16 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown
Browse files

ASoC: samsung: add explicit i2c/spi dependencies 



I got another build error from SND_SOC_SMARTQ selecting
SND_SOC_WM8750 without ensuring that I2C is enabled,
in this example, i2c is a loadable module:

sound/built-in.o: In function `wm8750_i2c_probe':
:(.text+0x3e6c0): undefined reference to `devm_regmap_init_i2c'
sound/built-in.o: In function `wm8750_exit':
:(.exit.text+0x3f4): undefined reference to `i2c_del_driver'
sound/built-in.o: In function `wm8750_modinit':
:(.init.text+0x13d0): undefined reference to `i2c_register_driver'

This changes the samsund ASoC Kconfig to have explicit
I2C dependencies for each driver that uses an i2c bus and
SPI dependencies for the ones using those.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent a40712a3

sound/soc/samsung/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ config SND_SOC_SAMSUNG_NEO1973_WM8753 


config SND_SOC_SAMSUNG_JIVE_WM8750

	tristate "SoC I2S Audio support for Jive"

	depends on SND_SOC_SAMSUNG && MACH_JIVE

	depends on SND_SOC_SAMSUNG && MACH_JIVE && I2C

	select SND_SOC_WM8750

	select SND_S3C2412_SOC_I2S

	help
@@ -148,7 +148,7 @@ config SND_SOC_SAMSUNG_SMDK_WM9713 


config SND_SOC_SMARTQ

	tristate "SoC I2S Audio support for SmartQ board"

	depends on SND_SOC_SAMSUNG && MACH_SMARTQ

	depends on SND_SOC_SAMSUNG && MACH_SMARTQ && I2C

	select SND_SAMSUNG_I2S

	select SND_SOC_WM8750
@@ -200,7 +200,7 @@ config SND_SOC_SPEYSIDE 


config SND_SOC_TOBERMORY

	tristate "Audio support for Wolfson Tobermory"

	depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && INPUT

	depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && INPUT && I2C

	select SND_SAMSUNG_I2S

	select SND_SOC_WM8962
@@ -216,7 +216,7 @@ config SND_SOC_BELLS 


config SND_SOC_LOWLAND

	tristate "Audio support for Wolfson Lowland"

	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_SOC_WM5100

	select SND_SOC_WM9081