From patchwork Thu Oct 17 12:28:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 1178499 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46v7m66NY9z9sPn; Thu, 17 Oct 2019 23:30:14 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iL4ux-0006RS-9q; Thu, 17 Oct 2019 12:30:11 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iL4u3-0006Gi-0L for kernel-team@lists.ubuntu.com; Thu, 17 Oct 2019 12:29:15 +0000 Received: from [221.221.97.154] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iL4u2-0007t4-1J for kernel-team@lists.ubuntu.com; Thu, 17 Oct 2019 12:29:14 +0000 From: Hui Wang To: kernel-team@lists.ubuntu.com Subject: [SRU][EOAN/unstable][PATCH 1/1] UBUNTU: [Config] Enable SOF_HDA link and codec Date: Thu, 17 Oct 2019 20:28:50 +0800 Message-Id: <20191017122850.23090-2-hui.wang@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191017122850.23090-1-hui.wang@canonical.com> References: <20191017122850.23090-1-hui.wang@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" https://bugs.launchpad.net/bugs/1848490 The Eoan kernel already has alsa/sof driver, we need to enable SOF_HDA link and codec, otherwise the dmic can't work on the Dell and Lenovo machines which have the dmic directly connected to PCH. Because the SOF_HDA depneds on the NOCODEC=n, we need to disable SOF_NOCODEC. Signed-off-by: Hui Wang --- debian.master/config/config.common.ubuntu | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 555862498d8f..0d36f4e1c1bd 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -9250,6 +9250,8 @@ CONFIG_SND_SOC_SOF_GEMINILAKE=m CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y CONFIG_SND_SOC_SOF_HDA_COMMON=m CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m +CONFIG_SND_SOC_SOF_HDA_LINK=y +CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y CONFIG_SND_SOC_SOF_ICELAKE=m CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y CONFIG_SND_SOC_SOF_INTEL_ACPI=m @@ -9260,8 +9262,8 @@ CONFIG_SND_SOC_SOF_INTEL_PCI=m CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y CONFIG_SND_SOC_SOF_MERRIFIELD=m CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y -CONFIG_SND_SOC_SOF_NOCODEC=m -CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT=y +# CONFIG_SND_SOC_SOF_NOCODEC is not set +# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set CONFIG_SND_SOC_SOF_OPTIONS=m CONFIG_SND_SOC_SOF_PCI=m # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set