Commit fd443a20 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown

ASoC: rt5682: fix I2C/Soundwire dependencies

If one of the two is a loadable module, the combined driver must
not be built-in:

aarch64-linux-ld: sound/soc/codecs/rt5682.o: in function `rt5682_sdw_hw_free':
rt5682.c:(.text+0xb34): undefined reference to `sdw_stream_remove_slave'
aarch64-linux-ld: sound/soc/codecs/rt5682.o: in function `rt5682_sdw_hw_params':
rt5682.c:(.text+0xe78): undefined reference to `sdw_stream_add_slave'

In particular, the soundwire driver must not be built-in if
CONFIG_I2C=m.

Fixes: 5549ea64 ("ASoC: rt5682: fix unmet dependencies")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20200428214642.3925004-1-arnd@arndb.deSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 087e3900
...@@ -1137,10 +1137,13 @@ config SND_SOC_RT5677_SPI ...@@ -1137,10 +1137,13 @@ config SND_SOC_RT5677_SPI
config SND_SOC_RT5682 config SND_SOC_RT5682
tristate tristate
depends on I2C || SOUNDWIRE depends on I2C || SOUNDWIRE
depends on SOUNDWIRE || !SOUNDWIRE
depends on I2C || !I2C
config SND_SOC_RT5682_SDW config SND_SOC_RT5682_SDW
tristate "Realtek RT5682 Codec - SDW" tristate "Realtek RT5682 Codec - SDW"
depends on SOUNDWIRE depends on SOUNDWIRE
depends on I2C || !I2C
select SND_SOC_RT5682 select SND_SOC_RT5682
select REGMAP_SOUNDWIRE select REGMAP_SOUNDWIRE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment