| From b83c5eac6b2398857b29695354e5c1082e9719c3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 25 Jan 2021 12:54:41 +0100 |
| Subject: ASoC: Intel: Skylake: Compile when any configuration is selected |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Cezary Rojewski <cezary.rojewski@intel.com> |
| |
| [ Upstream commit 1b99d50b9709a2cddaba4a7faf1862b4f7bec865 ] |
| |
| 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: 35bc99aaa1a3 ("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> |
| --- |
| sound/soc/intel/Makefile | 2 +- |
| sound/soc/intel/skylake/Makefile | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile |
| index 4e0248d2accc..7c5038803be7 100644 |
| --- a/sound/soc/intel/Makefile |
| +++ b/sound/soc/intel/Makefile |
| @@ -5,7 +5,7 @@ obj-$(CONFIG_SND_SOC) += common/ |
| # Platform Support |
| obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += atom/ |
| obj-$(CONFIG_SND_SOC_INTEL_CATPT) += catpt/ |
| -obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += skylake/ |
| +obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON) += skylake/ |
| obj-$(CONFIG_SND_SOC_INTEL_KEEMBAY) += keembay/ |
| |
| # Machine support |
| diff --git a/sound/soc/intel/skylake/Makefile b/sound/soc/intel/skylake/Makefile |
| index dd39149b89b1..1c4649bccec5 100644 |
| --- a/sound/soc/intel/skylake/Makefile |
| +++ b/sound/soc/intel/skylake/Makefile |
| @@ -7,7 +7,7 @@ ifdef CONFIG_DEBUG_FS |
| snd-soc-skl-objs += skl-debug.o |
| endif |
| |
| -obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += snd-soc-skl.o |
| +obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON) += snd-soc-skl.o |
| |
| #Skylake Clock device support |
| snd-soc-skl-ssp-clk-objs := skl-ssp-clk.o |
| -- |
| 2.30.2 |
| |