Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4732489pxj; Wed, 12 May 2021 11:58:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKiVgvBLZEAoC/EDK3EpVnHZBEawG1XS3YiJSfr3tdPl0a6Zx7In0rv+VRQ1WAkWwcJ/Q5 X-Received: by 2002:a17:907:75f6:: with SMTP id jz22mr38558042ejc.504.1620845881315; Wed, 12 May 2021 11:58:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620845881; cv=none; d=google.com; s=arc-20160816; b=isuMzJ3luutKf6htqYu/MIexELUi/HbjsC94sC1xHaXnLPYK4ZHHCjHJoRwmFLOXcq aq3FMF3OBBd+CXDFCCy4rM60iDXe5w+PUFBT/GxTfwnqvvkUSlhJSgPbMnhS2md61Fmj jD4qE1A9mB7IsfsIL1ik4KKhANTcAQdJFnMZ+29pqnluM+wR7+dmxnnbD48L41pprE1L mMuVE1c8Vv/t6VFrZ60gn1+IqxUYw1lQi81tJC2kfJVpbhO4F5/xAjBZqYfpnBQj7Sli aLSwJX07CMDoOTfF4WSKUugSyE25cJHMEM9MtN28+yRZdP1Wz1kQIbKXHnqY+Lcq/7CB 4/sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hoIHg7sz9zUrp3Qhv9FSXZTMAivz9M7ldHTh+Z2bN3o=; b=plxgzDWs1/yteaDr2ZkdnDI7ucvQvcBPVNrjQftWZfP2b5JzcLppBfy6ro3iIul5Ra 5vHIaU/03kk6BeIn1Yj569MmHHISUbEuLvmZstizYAQsz5ougnSxyOsGNTI8ijN9tBW9 /Vd8gY26zTEwK4TQWlA7O5pxB/3GeJseXVzJDotWVE2601Fwr38BwEP/PO1qT/ly72jx WfIWHu3SzpsbfvT8TuaQVziC8WkPya26ojEMpXnUFftNNPQq/s1ueVK4k6Yim+3bdnXu IesNf17o1wGa6dSbmOKPNIkmOblLBgVBcTLtLp5U4hOaYFxujIWEwmidj2/QzfuSr24w Oh0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YTMymD99; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jg13si934168ejc.430.2021.05.12.11.57.37; Wed, 12 May 2021 11:58:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YTMymD99; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359373AbhELSxE (ORCPT + 99 others); Wed, 12 May 2021 14:53:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:33526 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243905AbhELQmN (ORCPT ); Wed, 12 May 2021 12:42:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DE5FD61C4E; Wed, 12 May 2021 16:08:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620835681; bh=lWAe6F9r8Lrfds6fQrRTVqqyjx7rt38dkj+xdRnVuwc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YTMymD99gl9eQULr7Mf0lGCQP+80V7QGYTDmoNhzJAojO9ldXuM0kxqSpcMSCpbYS 7AVydHCBkD8oTvYW+T71mYbVEEVpilQPOtIISoPMZyDB8cZq7WnvOmWszitfnIP5fJ XTe2AlsSasK89aFqiSLlJSPYVcLX61l/C9j5MWO4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kai-Heng Feng , =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= , Cezary Rojewski , Mark Brown , Sasha Levin Subject: [PATCH 5.12 441/677] ASoC: Intel: Skylake: Compile when any configuration is selected Date: Wed, 12 May 2021 16:48:07 +0200 Message-Id: <20210512144851.995467370@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Cezary Rojewski [ 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 Suggested-by: Amadeusz Sławiński Fixes: 35bc99aaa1a3 ("ASoC: Intel: Skylake: Add more platform granularity") Signed-off-by: Cezary Rojewski Link: https://lore.kernel.org/r/20210125115441.10383-1-cezary.rojewski@intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- 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