summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSathyanarayana Nujella <sathyanarayana.nujella@intel.com>2018-05-02 18:24:17 -0700
committerMartin Roth <martinroth@google.com>2018-05-08 03:07:59 +0000
commit20c78048a7a637d0de4505bdcbc00a994eee83fc (patch)
tree3b1e356517f93e9a9606ae808eb3262ac7034f12
parent7a11c900b6af156bbd60b3231e9261177955e84c (diff)
mb/google/poppy/variants/atlas: update DMIC NHLT configuration
From coreboot side, include DMIC 4ch NHLT configuration and its DMIC blob. In OS side, cras picks the needed channels using UCM's channel map configuration. So, this patch updates to include DMIC 4ch config. BUG=b:79158926 TEST=Verified 4-ch record with arecord TEST=Also verified internal mic record with cras using 'cras_test_client --capture_file dmic.raw --rate 48000 --num_channels 2 --duration 10' Change-Id: Ic6df00c2f26ad9cdf54152ab021c2b10499c429c Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com> Reviewed-on: https://review.coreboot.org/26019 Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-by: Lijian Zhao <lijian.zhao@intel.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/google/poppy/Kconfig2
-rw-r--r--src/mainboard/google/poppy/variants/atlas/nhlt.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 8cd636d18e..37751f484b 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -64,7 +64,7 @@ config INCLUDE_NHLT_BLOBS
config INCLUDE_NHLT_BLOBS_ATLAS
bool "Include blobs for atlas audio."
select NHLT_DA7219
- select NHLT_DMIC_2CH
+ select NHLT_DMIC_4CH
select NHLT_MAX98373
config INCLUDE_NHLT_BLOBS_NAUTILUS
diff --git a/src/mainboard/google/poppy/variants/atlas/nhlt.c b/src/mainboard/google/poppy/variants/atlas/nhlt.c
index df62112ac3..4d0fd1ee0a 100644
--- a/src/mainboard/google/poppy/variants/atlas/nhlt.c
+++ b/src/mainboard/google/poppy/variants/atlas/nhlt.c
@@ -20,9 +20,9 @@
void variant_nhlt_init(struct nhlt *nhlt)
{
- /* 2 Channel DMIC array. */
- if (nhlt_soc_add_dmic_array(nhlt, 2))
- printk(BIOS_ERR, "Couldn't add 2CH DMIC array.\n");
+ /* 4 Channel DMIC array. */
+ if (nhlt_soc_add_dmic_array(nhlt, 4))
+ printk(BIOS_ERR, "Couldn't add 4CH DMIC arrays.\n");
/* Dialog DA7219 Headset codec. */
if (nhlt_soc_add_da7219(nhlt, AUDIO_LINK_SSP1))