Skip to content

Commit 4ebb3b7

Browse files
crojewsk-intelgregkh
authored andcommitted
ASoC: Intel: Skylake: Compile when any configuration is selected
[ Upstream commit 1b99d50 ] Skylake is dependent on SND_SOC_INTEL_SKYLAKE (aka "all SST platforms") whereas selecting specific configuration such as KBL-only will not cause driver code to compile. Switch to SND_SOC_INTEL_SKYLAKE_COMMON dependency so selecting any configuration causes the driver to be built. Reported-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Suggested-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Fixes: 35bc99a ("ASoC: Intel: Skylake: Add more platform granularity") Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> Link: https://lore.kernel.org/r/20210125115441.10383-1-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 5fb733e commit 4ebb3b7

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

sound/soc/intel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ obj-$(CONFIG_SND_SOC) += common/
55
# Platform Support
66
obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += atom/
77
obj-$(CONFIG_SND_SOC_INTEL_CATPT) += catpt/
8-
obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += skylake/
8+
obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON) += skylake/
99
obj-$(CONFIG_SND_SOC_INTEL_KEEMBAY) += keembay/
1010

1111
# Machine support

sound/soc/intel/skylake/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ifdef CONFIG_DEBUG_FS
77
snd-soc-skl-objs += skl-debug.o
88
endif
99

10-
obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += snd-soc-skl.o
10+
obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON) += snd-soc-skl.o
1111

1212
#Skylake Clock device support
1313
snd-soc-skl-ssp-clk-objs := skl-ssp-clk.o

0 commit comments

Comments
 (0)