From patchwork Wed Oct 23 15:32:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 1182262 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 46yvXD451xz9sNx; Thu, 24 Oct 2019 02:33:00 +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 1iNId6-0004wy-Ge; Wed, 23 Oct 2019 15:32:56 +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 1iNId3-0004wm-Ty for kernel-team@lists.ubuntu.com; Wed, 23 Oct 2019 15:32:53 +0000 Received: from mail-wr1-f70.google.com ([209.85.221.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iNId3-0002ts-Ox for kernel-team@lists.ubuntu.com; Wed, 23 Oct 2019 15:32:53 +0000 Received: by mail-wr1-f70.google.com with SMTP id 92so5860031wro.14 for ; Wed, 23 Oct 2019 08:32:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=2BJqffFPT4zg/fyGd8/ks8cVUv76u8BFi+fdIsKUzo4=; b=I+fovhSNldgiMKAXfJSDNUem/vpEeoh8eRYDA2mc7AXVhmy/MhRZnKy6QXZdd+SmUm KyWtXDWZrJ+USkTIZ13Rc5kbD+d//oVI5Oz7iD2Y+a3LrXKYEXVh7I7XqffkFYqc0Vbz q0VXtITQF8gLWTqSNd6OGGCAjc56RdWW6E1IY00EaUZSikyq+IRinl7BgFejJ/2cSAqA F72XXcTwEjH3WOyhQ+hLd1j/HaayeEk5ihfTfs15gMZMFdoR7PuhhXF9P9Ib4wbQzOMf uRTL4u7wORlEXSAGUJ61h+vhgke/mOa4bsiypuRRi1Gj7REEeUd+GeBdQEqlXJ6CY4Wr UWOQ== X-Gm-Message-State: APjAAAX/xKq7ccjSP6VcR+/PX7kcAfDhTA2BlVFQfjw4TBuk5LLEnO26 0XH4SrMl5k0XIcqc7E/85QSK/wII4u15wz7DJUzZ91k4FhDKS28aSl2ZvvMm33a5K9DhyAP/NBX TV7NGLZ7DNyQ+4GXBvX2Ba8okxK2Kt2XWHprdD7uVAA== X-Received: by 2002:adf:c409:: with SMTP id v9mr9044138wrf.41.1571844773241; Wed, 23 Oct 2019 08:32:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqw/Cc5KHDruhCWJcoGyMNfXWbV+2fxVFzKAMpMB7Wrlljhb6xI+FRCBjvTRkZZ+VRxMjwMd7Q== X-Received: by 2002:adf:c409:: with SMTP id v9mr9044123wrf.41.1571844772962; Wed, 23 Oct 2019 08:32:52 -0700 (PDT) Received: from [10.240.184.111] ([212.121.131.210]) by smtp.gmail.com with ESMTPSA id s9sm26205830wme.36.2019.10.23.08.32.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 08:32:52 -0700 (PDT) Subject: APPLIED/cmnt: [SRU][EOAN/unstable][PATCH 1/1] UBUNTU: [Config] Enable SOF_HDA link and codec To: Hui Wang , kernel-team@lists.ubuntu.com References: <20191017122850.23090-1-hui.wang@canonical.com> <20191017122850.23090-2-hui.wang@canonical.com> From: Kleber Souza Openpgp: preference=signencrypt Autocrypt: addr=kleber.souza@canonical.com; prefer-encrypt=mutual; keydata= mQENBFjjmLgBCADW/wnobGtt4lIvs0nkVbvecpvmvH6j7oFy92KxnAVPr4akWmLwLHH8id1k tKJlR1KlINf089anZfIK9uC6lFWjlmrg94U+9zZHUlG+MdLeJrqRWJAxqjz2DT3EYq9vDpxt uLaZws5EAWvxswa9oTtbwIWA1sqeps5DWUw95zFGeaxS/hisdlywU5G+I/pKLNkwTMyjwICC gHuUvCNuuOt5ZDu3i6Z76XKedu6YyWSVquesMzWAt6XO3QTXLB2b67eqalxxbTSHdkzrt5sR Ai4BQhr5d3jziYWRK5tPi+nj72/kWv0C12WQqzSFOZ5rYEZu3Ypyu+t4AoTzJ1GpzZEhABEB AAG0NktsZWJlciBTYWNpbG90dG8gZGUgU291emEgPGtsZWJlci5zb3V6YUBjYW5vbmljYWwu Y29tPokBVwQTAQgAQQIbAwULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAIZARYhBPLtrW77uQZf 0wPbYUaq8zVw4RYrBQJcDjXSBQkFC9CaAAoJEEaq8zVw4RYrIDcIAJX/8QBmtOFTbQWeKoCr FTLVu1DDMd7av/cCT7L4JOMfRQ6rXrPyhsgyqVW4l5l+co+OXFidpWBJBCAGun95nkKY4sK6 JIL2MXq8KiUQMBGXuMuvrzPOK5V04BR2vjYhYdFFppnluRl5cbAVbHK+HMvcXXzjfWLb2Zmr 5x1j0ZtuJOUsoHWQQeJwtDufSgaW6fOWJg76vVx6gvd2pZ9P2ZIr0zKA2fxQZ7WD+pLTfBly 81ktHD0XwOF4g3LPzcjuOuP+aNb757YZcCMi2/3zy+07QkNmaqg3sYYu9ISegNta6bESsdvx uhcsQYDt4ebzu29e7t5YYoncKIW+UllnsKG5AQ0EWOOYuAEIAMJqK7zV//x1PaUVVnJiSoEZ FBCOoZelEajq4veDVUEUoOvXCVv93aQEnAZtb4wqAlGtZKGn74oaxgVjRLvUIUFWRf+FvcWh mzO2geaTmRQ4W5XdFeCymNmuwDVIH90ZjwFFZI5Mc6lFX8k4eBPhxNxXuhM+8rHWpiHVwUap /YqYxyvEP88BVrQqZQgwQjGVDE9PNIOwPUsYGdhSd+8lvFP2ygVR3BhlLT9aAJqsGRyQWEuj CA5/xyTRi1nfF/cAUQkfFCXHj0Hiddw0zTclBuWdZzqdQZwF64e4OwAy+XtJ6lYeuHM/Ztxg ebWFnWILqZLLowCwp2inyZeXC1IuTQcAEQEAAYkBHwQYAQgACQUCWOOYuAIbDAAKCRBGqvM1 cOEWK2ZQCACByBGwoXsqfSZB+lnkTp5dV1aQ+peC7T+I8GQKVvckFVv3lv73ibm1uBNrnRjO A6802JneP1M8Qo8h1olc0iXyXnIpnMz1dZBsj5VJoYRMes6UB96PuafdNKnVo6XYc9xE0QMR CIUoZ37nC7gMCgAhM5eY4SjMxjy8aXiNpWt7WGCZoCvRSrWn0CrWGvMriXbqHf5/PHhoOGCR rK1PlxFYriuuBtGUP/kAy2rzT4B5NywXrAHg4IrgMxEdYHy6LiutpSRKmFHwO4IAmB8pUrbe wJxW6Rkg2c10vzfvPChs8bedvyb8eioU19QS0prjxywrWie6fwT5NqGmE6Nv4+kA Message-ID: <8820e8e2-5c15-9530-a692-b2f14cf6725e@canonical.com> Date: Wed, 23 Oct 2019 17:32:50 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191017122850.23090-2-hui.wang@canonical.com> Content-Language: en-US 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" On 10/17/19 2:28 PM, Hui Wang wrote: > https://bugs.launchpad.net/bugs/1848490 BugLink: ... > > 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 > These additional config changes were made after running 'updateconfigs': So I have committed them as well. Please run 'updateconfigs' when submitting config changes so we can review all changes needed. I have also removed the 'snd-sof-nocodec' module from previous ABI modules list so the packages can be compiled. Applied to eoan/master-next branch. Thanks, Kleber diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index f23e49068940..309f564ca6ef 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -9248,10 +9248,11 @@ CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set CONFIG_SND_SOC_SOF_GEMINILAKE=m CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_HDA=m +CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=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_HDA_LINK_BASELINE=m CONFIG_SND_SOC_SOF_ICELAKE=m CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y CONFIG_SND_SOC_SOF_INTEL_ACPI=m @@ -9262,10 +9263,10 @@ 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 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_PROBE_WORK_QUEUE=y # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SOF_XTENSA=m