From patchwork Fri May 10 22:39:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Green X-Patchwork-Id: 10939677 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8597F1515 for ; Fri, 10 May 2019 23:07:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 737951FF1E for ; Fri, 10 May 2019 23:07:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 676371FF66; Fri, 10 May 2019 23:07:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D2F6C1FF1E for ; Fri, 10 May 2019 23:06:58 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 138B018D3; Sat, 11 May 2019 00:40:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 138B018D3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1557528090; bh=5RIfAZ3zJnkZUjYtAKYHJcq2iwaSHa+93bZflbfJjNc=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=AR84zZEdFSEo55UTVRfPzdxq6cBsP3VgCUHcKn9/FZV8542YXvMVnTyuqcfI1awZR PcHZQ6vuUSMfRMbtp3u6JDRjarV9sNd2ZL5tI5ZVUyOAlgyivSYphzZqmx92egzXVD uwjyMXJ6QShoppFLJlHw4HWXPpSv5I9EX0GBF3k4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id D17A1F89726; Sat, 11 May 2019 00:39:51 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 958F6F89726; Sat, 11 May 2019 00:39:50 +0200 (CEST) Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id DB036F8970E for ; Sat, 11 May 2019 00:39:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz DB036F8970E Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="a6OnrweB" Received: by mail-pg1-x541.google.com with SMTP id t22so3649488pgi.10 for ; Fri, 10 May 2019 15:39:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=btsWjRP5fMorg/50XHE1AhFeDHrZVO/tdOU3AkASJ7Q=; b=a6OnrweBxtt7NkvEdUNplsNNvQ4sNDXgesDB2iG1R1yxR5CioQT6uI6SsDYsOlRGVJ nXWhQA0mEOMVNhRtNUO4Ccl1UQirg8OZlU1AdDJDvs4SyaOwguDHbTj44A0Jakwozs1B wwinoq6Vors0uxxc591xIBjZ624499lmP2Bdk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=btsWjRP5fMorg/50XHE1AhFeDHrZVO/tdOU3AkASJ7Q=; b=RcIEcDJmJuDOZbXWBUkjbZfKkrD5vCAo7CduuroR4IrfoCifhogQw8Jkpf/PPxq5/3 /Nlh/I4vK0PlzadmbNxm/XIGb+sNZr3StEse4lJ57gGoI+5jv3PofhodhOoV2z70NQtZ BUXyzXJEGtYQxXUjwFK+bzTqQB83yuroKBOApFT2LkYxKeHuQFiaVqCESG8GWNdHyCrW NdR5FzhrMDwpBlwfsKlTf8ikPJP6o1I3BghPPtA/YR32Hae0CUooCknmacRpV2OGOEZp W9qnXjkqKi3gQujlcRCHCiI/o0Mp85OW1lFzHF0PudSp0DimQNIAy6GDPJwrJJFELXYd 4C5g== X-Gm-Message-State: APjAAAUpMZ2SZdbqyWdl12PNQfbAfbz9W36mIpCLTCj8hofYE2gIqKoT yHdFh0dIdwU2xbOPjleucjA64A== X-Google-Smtp-Source: APXvYqweIgH4BFWK+Kw6cY3nsX0Zo2SGslEeQYFM8I6kmq6sGDYYG3FZxMlP8D3EIOb5rYXde/pNnw== X-Received: by 2002:a65:4183:: with SMTP id a3mr16513747pgq.121.1557527985655; Fri, 10 May 2019 15:39:45 -0700 (PDT) Received: from evgreen2.mtv.corp.google.com ([2620:15c:202:201:ffda:7716:9afc:1301]) by smtp.gmail.com with ESMTPSA id u66sm13300540pfa.36.2019.05.10.15.39.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 May 2019 15:39:44 -0700 (PDT) From: Evan Green To: Liam Girdwood , Mark Brown Date: Fri, 10 May 2019 15:39:28 -0700 Message-Id: <20190510223929.165569-2-evgreen@chromium.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190510223929.165569-1-evgreen@chromium.org> References: <20190510223929.165569-1-evgreen@chromium.org> MIME-Version: 1.0 Cc: Rajat Jain , alsa-devel@alsa-project.org, Liam Girdwood , linux-kernel@vger.kernel.org, Takashi Iwai , Pierre-Louis Bossart , Evan Green , Ben Zhang , Sathya Prakash , Naveen M Subject: [alsa-devel] [PATCH v3 1/2] ASoC: SOF: Add Comet Lake PCI IDs X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add support for Intel Comet Lake platforms by adding a new Kconfig for CometLake and the appropriate PCI IDs. Signed-off-by: Evan Green --- Changes in v3: - Copy cnl_desc to new cml_desc, and avoid selecting cannonlake (Pierre-Louis) Changes in v2: - Add CML-H ID 0x06c8 (Pierre-Louis) sound/soc/sof/intel/Kconfig | 32 ++++++++++++++++++++++++++++++++ sound/soc/sof/sof-pci-dev.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index 603e0db4f012..17e10d65fc0c 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -24,6 +24,8 @@ config SND_SOC_SOF_INTEL_PCI select SND_SOC_SOF_CANNONLAKE if SND_SOC_SOF_CANNONLAKE_SUPPORT select SND_SOC_SOF_COFFEELAKE if SND_SOC_SOF_COFFEELAKE_SUPPORT select SND_SOC_SOF_ICELAKE if SND_SOC_SOF_ICELAKE_SUPPORT + select SND_SOC_SOF_COMETLAKE_LP if SND_SOC_SOF_COMETLAKE_LP_SUPPORT + select SND_SOC_SOF_COMETLAKE_H if SND_SOC_SOF_COMETLAKE_H_SUPPORT help This option is not user-selectable but automagically handled by 'select' statements at a higher level @@ -179,6 +181,36 @@ config SND_SOC_SOF_ICELAKE This option is not user-selectable but automagically handled by 'select' statements at a higher level +config SND_SOC_SOF_COMETLAKE_LP + tristate + select SND_SOC_SOF_HDA_COMMON + help + This option is not user-selectable but automagically handled by + 'select' statements at a higher level + +config SND_SOC_SOF_COMETLAKE_LP_SUPPORT + bool "SOF support for CometLake-LP" + help + This adds support for Sound Open Firmware for Intel(R) platforms + using the Cometlake-LP processors. + Say Y if you have such a device. + If unsure select "N". + +config SND_SOC_SOF_COMETLAKE_H + tristate + select SND_SOC_SOF_HDA_COMMON + help + This option is not user-selectable but automagically handled by + 'select' statements at a higher level + +config SND_SOC_SOF_COMETLAKE_H_SUPPORT + bool "SOF support for CometLake-H" + help + This adds support for Sound Open Firmware for Intel(R) platforms + using the Cometlake-H processors. + Say Y if you have such a device. + If unsure select "N". + config SND_SOC_SOF_HDA_COMMON tristate select SND_SOC_SOF_INTEL_COMMON diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index b778dffb2d25..d736806c2e0d 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -129,6 +129,26 @@ static const struct sof_dev_desc cfl_desc = { }; #endif +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP) || \ + IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H) + +static const struct sof_dev_desc cml_desc = { + .machines = snd_soc_acpi_intel_cnl_machines, + .resindex_lpe_base = 0, + .resindex_pcicfg_base = -1, + .resindex_imr_base = -1, + .irqindex_host_ipc = -1, + .resindex_dma_base = -1, + .chip_info = &cnl_chip_info, + .default_fw_path = "intel/sof", + .default_tplg_path = "intel/sof-tplg", + .nocodec_fw_filename = "sof-cnl.ri", + .nocodec_tplg_filename = "sof-cnl-nocodec.tplg", + .ops = &sof_cnl_ops, + .arch_ops = &sof_xtensa_arch_ops +}; +#endif + #if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE) static const struct sof_dev_desc icl_desc = { .machines = snd_soc_acpi_intel_icl_machines, @@ -353,6 +373,14 @@ static const struct pci_device_id sof_pci_ids[] = { #if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE) { PCI_DEVICE(0x8086, 0x34C8), .driver_data = (unsigned long)&icl_desc}, +#endif +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP) + { PCI_DEVICE(0x8086, 0x02c8), + .driver_data = (unsigned long)&cml_desc}, +#endif +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H) + { PCI_DEVICE(0x8086, 0x06c8), + .driver_data = (unsigned long)&cml_desc}, #endif { 0, } }; From patchwork Fri May 10 22:39:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Green X-Patchwork-Id: 10939675 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0F2DE92A for ; Fri, 10 May 2019 23:07:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC6EC1FF65 for ; Fri, 10 May 2019 23:06:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9F061FF7E; Fri, 10 May 2019 23:06:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D8EC21FF65 for ; Fri, 10 May 2019 23:06:58 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 44B1C18CE; Sat, 11 May 2019 00:41:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 44B1C18CE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1557528135; bh=wUTbdhZFu+xPWlh8ZdVdt/KNDY1aM2Ad//Hc2avqwVY=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=VrmZM8akUm0iNMxDHJu/B23M1B4j/ayIcB5Ncjyrb3AUyoRlRadBBnbDL2OFHKOJD mGX+SIZ+VXI21aemi+HzEua1vaPnUBrvkw/9epJtNmfD1Tf1RsRCcJKIIh7YRLd5CL /tpqZaoIsl7GFrEVmc/bleYeh7NxZVgDYBCvuKiA= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 5665AF8972A; Sat, 11 May 2019 00:39:54 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id C0FC6F8970E; Sat, 11 May 2019 00:39:52 +0200 (CEST) Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id F2AD9F8970E for ; Sat, 11 May 2019 00:39:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz F2AD9F8970E Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="CW3FW1Qa" Received: by mail-pg1-x544.google.com with SMTP id e6so3660374pgc.4 for ; Fri, 10 May 2019 15:39:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9SfaLLvXepQRjPBSTX7ofFVM9xFaCs9uEAd6y7Vf/jI=; b=CW3FW1QaMndV6cwwyiyNA8R53BhYSKmW1OSkoFcainmLy819+8sTqcbkORQZyJkm+j Xv2ZITvIK9F7I695Ipiy4gQ1xDUxh0NYNr8Kjztz40o19XH6MbspMyOdaQVO0Y1twGp7 hRTBhLibmNvg9nBN/yrN6K3nY6blDcUvKTMQM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9SfaLLvXepQRjPBSTX7ofFVM9xFaCs9uEAd6y7Vf/jI=; b=du/02VBcoYqB60groL9APosZm1dZs928o56r3yPMpmp+ScOjZaetD/CbOo8jzFjnGE VFuEdhMSu/6XFKK8bzByBHBuqDKElHOXfLThb9F4mfH1+xKLzwUv0Ss1FQGWfeOPm9Qr YNMLlm4PkrfcuoD9NqtUAOZDYh2CpwiHtN1g5zkDuGmqqDjacjt6xFnZU5tTn3jdDAi4 alVIY8pJkpCAJ7xXlue82IcaL1QtbeoK+BFnbdrYvIfUShSvft4oDjJOILxDTxJo007m LD8cssCqNdCcIYziC/1z2d0qFojPHP8mPaHW4nMlVi8pFbJIFBsM64LV49BVaL9T0XaE /S7A== X-Gm-Message-State: APjAAAXG+ww6HFazwG6KyDvwlTLWrbih5/QC/mSP5wf6TF8RX6ZN5tO6 a4aIHsmgUBhMFQ/yROqWo5uCHA== X-Google-Smtp-Source: APXvYqyRgDz+Yrd5PgXej0kYFwSP00cOYoCC+OFOn+fT0I0FzCSLjsERw1RyZahadf+YpZ58Uxujag== X-Received: by 2002:aa7:8a53:: with SMTP id n19mr17229422pfa.11.1557527988266; Fri, 10 May 2019 15:39:48 -0700 (PDT) Received: from evgreen2.mtv.corp.google.com ([2620:15c:202:201:ffda:7716:9afc:1301]) by smtp.gmail.com with ESMTPSA id u66sm13300540pfa.36.2019.05.10.15.39.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 May 2019 15:39:47 -0700 (PDT) From: Evan Green To: Liam Girdwood , Mark Brown Date: Fri, 10 May 2019 15:39:29 -0700 Message-Id: <20190510223929.165569-3-evgreen@chromium.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190510223929.165569-1-evgreen@chromium.org> References: <20190510223929.165569-1-evgreen@chromium.org> MIME-Version: 1.0 Cc: Rajat Jain , alsa-devel@alsa-project.org, Yu Zhao , linux-kernel@vger.kernel.org, Takashi Iwai , Jie Yang , Pierre-Louis Bossart , Evan Green , Ben Zhang , Rakesh Ughreja , Sathya Prakash , Naveen M , Guenter Roeck Subject: [alsa-devel] [PATCH v3 2/2] ASoC: Intel: Skylake: Add Cometlake PCI IDs X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add PCI IDs for Intel CometLake platforms, which from a software point of view are extremely similar to Cannonlake platforms. Signed-off-by: Evan Green --- Changes in v3: - Don't select CML_* in SND_SOC_INTEL_SKYLAKE (Pierre-Louis) Changes in v2: - Add 0x06c8 for CML-H (Pierre-Louis) sound/soc/intel/Kconfig | 16 ++++++++++++++++ sound/soc/intel/skylake/skl-messages.c | 16 ++++++++++++++++ sound/soc/intel/skylake/skl.c | 10 ++++++++++ 3 files changed, 42 insertions(+) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index fc1396adde71..b089ed3bf77f 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -165,6 +165,22 @@ config SND_SOC_INTEL_CFL If you have a Intel CoffeeLake platform with the DSP enabled in the BIOS then enable this option by saying Y or m. +config SND_SOC_INTEL_CML_H + tristate "CometLake-H Platforms" + depends on PCI && ACPI + select SND_SOC_INTEL_SKYLAKE_FAMILY + help + If you have a Intel CometLake-H platform with the DSP + enabled in the BIOS then enable this option by saying Y or m. + +config SND_SOC_INTEL_CML_LP + tristate "CometLake-LP Platforms" + depends on PCI && ACPI + select SND_SOC_INTEL_SKYLAKE_FAMILY + help + If you have a Intel CometLake-LP platform with the DSP + enabled in the BIOS then enable this option by saying Y or m. + config SND_SOC_INTEL_SKYLAKE_FAMILY tristate select SND_SOC_INTEL_SKYLAKE_COMMON diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c index 4bf70b4429f0..df01dc952521 100644 --- a/sound/soc/intel/skylake/skl-messages.c +++ b/sound/soc/intel/skylake/skl-messages.c @@ -255,6 +255,22 @@ static const struct skl_dsp_ops dsp_ops[] = { .init_fw = cnl_sst_init_fw, .cleanup = cnl_sst_dsp_cleanup }, + { + .id = 0x02c8, + .num_cores = 4, + .loader_ops = bxt_get_loader_ops, + .init = cnl_sst_dsp_init, + .init_fw = cnl_sst_init_fw, + .cleanup = cnl_sst_dsp_cleanup + }, + { + .id = 0x06c8, + .num_cores = 4, + .loader_ops = bxt_get_loader_ops, + .init = cnl_sst_dsp_init, + .init_fw = cnl_sst_init_fw, + .cleanup = cnl_sst_dsp_cleanup + }, }; const struct skl_dsp_ops *skl_get_dsp_ops(int pci_id) diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 4ed5b7e17d44..f864f7b3df3a 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -1166,6 +1166,16 @@ static const struct pci_device_id skl_ids[] = { /* CFL */ { PCI_DEVICE(0x8086, 0xa348), .driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines}, +#endif +#if IS_ENABLED(CONFIG_SND_SOC_INTEL_CML_LP) + /* CML-LP */ + { PCI_DEVICE(0x8086, 0x02c8), + .driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines}, +#endif +#if IS_ENABLED(CONFIG_SND_SOC_INTEL_CML_H) + /* CML-H */ + { PCI_DEVICE(0x8086, 0x06c8), + .driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines}, #endif { 0, } };