]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ASoC: Intel: sof-rt5682: fix undefined references with Baytrail-only support
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Tue, 28 May 2019 16:28:22 +0000 (11:28 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Jul 2019 07:10:18 +0000 (09:10 +0200)
[ Upstream commit 17fc24875da1bef4650cf007edae3b2e26d2fa4e ]

The sof-rt5682 machine driver supports both legacy Baytrail devices
and more recent ApolloLake/CometLake platforms. When only Baytrail is
selected, the compilation fails with the following errors:

ERROR: "hdac_hdmi_jack_port_init"
[sound/soc/intel/boards/snd-soc-sof_rt5682.ko] undefined!

ERROR: "hdac_hdmi_jack_init"
[sound/soc/intel/boards/snd-soc-sof_rt5682.ko] undefined!

Fix by selecting SND_SOC_HDAC_HDMI unconditionally. The code for HDMI
support is not reachable on Baytrail so this change has no functional
impact.

Fixes: f70abd75b7c6 ("ASoC: Intel: add sof-rt5682 machine driver")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/intel/boards/Kconfig

index 5407d217228eebeb92d1caba26b25a1cbdfe439f..c0aef45d335accbb27a924831c922453aa56fb90 100644 (file)
@@ -392,7 +392,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH
                   (SND_SOC_SOF_BAYTRAIL && X86_INTEL_LPSS)
        select SND_SOC_RT5682
        select SND_SOC_DMIC
-       select SND_SOC_HDAC_HDMI if SND_SOC_SOF_HDA_COMMON
+       select SND_SOC_HDAC_HDMI
        help
           This adds support for ASoC machine driver for SOF platforms
           with rt5682 codec.