summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Doron <benjamin.doron00@gmail.com>2020-10-24 02:25:54 +0000
committerPatrick Georgi <pgeorgi@google.com>2020-11-24 09:42:14 +0000
commit9ee1b82db42623fb700b62d21b5f6d95a0e2e02c (patch)
tree7068b7aea75e2c444f53aaec6ca85768631b508e
parent1e6a227f1001825f3a948b0734fe60dc0313a88c (diff)
soc/intel/skylake: Use correct NHLT_PDM_DEV definition
According to the NHLT specification[1], PDM_DEV is defined as "1" on Kabylake based platforms. coreboot currently sets it to "0" on all platforms. Add an entry to the enum and use it to define NHLT_PDM_DEV for Kabylake. "Device Type" will resume from "2" on all platforms, but entries are currently reserved. Tested on an Acer Aspire VN7-572G (Skylake-U), which has a 1ch array DMIC, on Windows 10. 1. https://01.org/sites/default/files/595976_intel_sst_nhlt.pdf Change-Id: Ifbc67228c9e7af7db5154d597ca8d67860cfd2ed Signed-off-by: Benjamin Doron <benjamin.doron00@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/45010 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/include/nhlt.h1
-rw-r--r--src/soc/intel/skylake/nhlt/dmic.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/include/nhlt.h b/src/include/nhlt.h
index 335580144c..167be520dc 100644
--- a/src/include/nhlt.h
+++ b/src/include/nhlt.h
@@ -187,6 +187,7 @@ enum {
enum {
NHLT_PDM_DEV,
+ NHLT_PDM_DEV_CAVS15, // NHLT_PDM_DEV on cAVS1.5 (KBL) based platforms
};
/* Endpoint direction. */
diff --git a/src/soc/intel/skylake/nhlt/dmic.c b/src/soc/intel/skylake/nhlt/dmic.c
index 16eb605557..76c1990826 100644
--- a/src/soc/intel/skylake/nhlt/dmic.c
+++ b/src/soc/intel/skylake/nhlt/dmic.c
@@ -33,7 +33,7 @@ static const struct nhlt_dmic_array_config dmic_2ch_mic_config = {
static const struct nhlt_endp_descriptor dmic_2ch_descriptors[] = {
{
.link = NHLT_LINK_PDM,
- .device = NHLT_PDM_DEV,
+ .device = NHLT_PDM_DEV_CAVS15,
.direction = NHLT_DIR_CAPTURE,
.vid = NHLT_VID,
.did = NHLT_DID_DMIC,
@@ -77,7 +77,7 @@ static const struct nhlt_dmic_array_config dmic_4ch_mic_config = {
static const struct nhlt_endp_descriptor dmic_4ch_descriptors[] = {
{
.link = NHLT_LINK_PDM,
- .device = NHLT_PDM_DEV,
+ .device = NHLT_PDM_DEV_CAVS15,
.direction = NHLT_DIR_CAPTURE,
.vid = NHLT_VID,
.did = NHLT_DID_DMIC,