| From 1a2808f317b46ca5ba00fefbb1481c74f7867986 Mon Sep 17 00:00:00 2001 |
| From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> |
| Date: Tue, 28 May 2019 11:28:22 -0500 |
| Subject: ASoC: Intel: sof-rt5682: fix undefined references with Baytrail-only |
| support |
| |
| [ 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 | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig |
| index 5407d217228e..c0aef45d335a 100644 |
| --- a/sound/soc/intel/boards/Kconfig |
| +++ b/sound/soc/intel/boards/Kconfig |
| @@ -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. |
| -- |
| 2.20.1 |
| |
