lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 102/717] ASoC: SOF: Intel: fix Kconfig dependency for SND_INTEL_DSP_CONFIG
    Date
    From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

    [ Upstream commit 358f0ac1f2791c80c19cc26706cf34664c9fd756 ]

    SND_INTEL_DSP_CONFIG is selected by the HDaudio, Skylake and SOF
    drivers. When the HDaudio link is not selected as a option, this
    Kconfig option is not touched and will default to whatever other
    drivers selected. In the case e.g. where HDaudio is compiled as
    built-in, the linker will complain:

    ld: sound/soc/sof/sof-pci-dev.o: in function `sof_pci_probe':
    sof-pci-dev.c:(.text+0x5c): undefined reference to
    `snd_intel_dsp_driver_probe'

    Adding the select for all HDaudio platforms, regardless of whether
    they rely on the HDaudio link or not, solves the problem.

    Reported-by: Randy Dunlap <rdunlap@infradead.org>
    Acked-by: Randy Dunlap <rdunlap@infradead.org>
    Fixes: 82d9d54a6c0ee ('ALSA: hda: add Intel DSP configuration / probe code')
    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
    Link: https://lore.kernel.org/r/20201112164425.25603-5-pierre-louis.bossart@linux.intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/sof/intel/Kconfig | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
    index a066e08860cbf..5bfc2f8b13b90 100644
    --- a/sound/soc/sof/intel/Kconfig
    +++ b/sound/soc/sof/intel/Kconfig
    @@ -271,6 +271,7 @@ config SND_SOC_SOF_JASPERLAKE

    config SND_SOC_SOF_HDA_COMMON
    tristate
    + select SND_INTEL_DSP_CONFIG
    select SND_SOC_SOF_INTEL_COMMON
    select SND_SOC_SOF_HDA_LINK_BASELINE
    help
    @@ -330,7 +331,6 @@ config SND_SOC_SOF_HDA
    tristate
    select SND_HDA_EXT_CORE if SND_SOC_SOF_HDA_LINK
    select SND_SOC_HDAC_HDA if SND_SOC_SOF_HDA_AUDIO_CODEC
    - select SND_INTEL_DSP_CONFIG
    help
    This option is not user-selectable but automagically handled by
    'select' statements at a higher level
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:07    [W:2.127 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site