From: Evan Green <evgreen@chromium.org>
To: Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Mark Brown <broonie@kernel.org>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Naveen M <naveen.m@intel.com>,
Sathya Prakash <sathya.prakash.m.r@intel.com>,
Ben Zhang <benzh@chromium.org>, Rajat Jain <rajatja@chromium.org>,
Evan Green <evgreen@chromium.org>,
Jaroslav Kysela <perex@perex.cz>,
alsa-devel@alsa-project.org,
Rakesh Ughreja <rakesh.a.ughreja@intel.com>,
Guenter Roeck <groeck@chromium.org>, Yu Zhao <yuzhao@google.com>,
linux-kernel@vger.kernel.org, Takashi Iwai <tiwai@suse.com>,
Jenny TC <jenny.tc@intel.com>,
Jie Yang <yang.jie@linux.intel.com>
Subject: [PATCH v2 2/2] ASoC: Intel: Skylake: Add Cometlake PCI IDs
Date: Tue, 7 May 2019 14:53:59 -0700 [thread overview]
Message-ID: <20190507215359.113378-3-evgreen@chromium.org> (raw)
In-Reply-To: <20190507215359.113378-1-evgreen@chromium.org>
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 <evgreen@chromium.org>
---
Changes in v2:
- Add 0x06c8 for CML-H (Pierre-Louis)
sound/soc/intel/Kconfig | 18 ++++++++++++++++++
sound/soc/intel/skylake/skl-messages.c | 16 ++++++++++++++++
sound/soc/intel/skylake/skl.c | 10 ++++++++++
3 files changed, 44 insertions(+)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index fc1396adde71..1ebac54b7081 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -110,6 +110,8 @@ config SND_SOC_INTEL_SKYLAKE
select SND_SOC_INTEL_GLK
select SND_SOC_INTEL_CNL
select SND_SOC_INTEL_CFL
+ select SND_SOC_INTEL_CML_H
+ select SND_SOC_INTEL_CML_LP
help
This is a backwards-compatible option to select all devices
supported by the Intel SST/Skylake driver. This option is no
@@ -165,6 +167,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, }
};
--
2.20.1
next prev parent reply other threads:[~2019-05-07 21:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-07 21:53 [PATCH v2 0/2] ASoC: Intel: Add Cometlake PCI IDs Evan Green
2019-05-07 21:53 ` [PATCH v2 1/2] ASoC: SOF: Add Comet Lake " Evan Green
2019-05-07 22:14 ` Pierre-Louis Bossart
2019-05-08 16:42 ` Evan Green
2019-05-08 17:00 ` Pierre-Louis Bossart
2019-05-08 21:58 ` Evan Green
2019-05-07 21:53 ` Evan Green [this message]
2019-05-07 22:31 ` [PATCH v2 2/2] ASoC: Intel: Skylake: Add Cometlake " Pierre-Louis Bossart
2019-05-08 16:51 ` Evan Green
2019-05-08 17:04 ` Pierre-Louis Bossart
2019-05-08 21:57 ` Evan Green
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190507215359.113378-3-evgreen@chromium.org \
--to=evgreen@chromium.org \
--cc=alsa-devel@alsa-project.org \
--cc=benzh@chromium.org \
--cc=broonie@kernel.org \
--cc=groeck@chromium.org \
--cc=jenny.tc@intel.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=naveen.m@intel.com \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=rajatja@chromium.org \
--cc=rakesh.a.ughreja@intel.com \
--cc=sathya.prakash.m.r@intel.com \
--cc=tiwai@suse.com \
--cc=yang.jie@linux.intel.com \
--cc=yuzhao@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).