lkml.org 
[lkml]   [2020]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 157/388] ASoC: rt5682: fix I2C/Soundwire dependencies
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit fd443a20c2f0950f3c31765a08f7dd49b3bc69cb ]

    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: 5549ea647997 ("ASoC: rt5682: fix unmet dependencies")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Link: https://lore.kernel.org/r/20200428214642.3925004-1-arnd@arndb.de
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/Kconfig | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
    index 7d2cbed55a9d..4c643d2e6d6b 100644
    --- a/sound/soc/codecs/Kconfig
    +++ b/sound/soc/codecs/Kconfig
    @@ -1136,10 +1136,13 @@ config SND_SOC_RT5677_SPI
    config SND_SOC_RT5682
    tristate
    depends on I2C || SOUNDWIRE
    + depends on SOUNDWIRE || !SOUNDWIRE
    + depends on I2C || !I2C

    config SND_SOC_RT5682_SDW
    tristate "Realtek RT5682 Codec - SDW"
    depends on SOUNDWIRE
    + depends on I2C || !I2C
    select SND_SOC_RT5682
    select REGMAP_SOUNDWIRE

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-18 03:12    [W:4.395 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site