summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
authorSathyanarayana Nujella <sathyanarayana.nujella@intel.com>2016-11-30 10:11:55 -0800
committerAaron Durbin <adurbin@chromium.org>2016-12-02 16:40:30 +0100
commit152c0ee5d0eae8e882f9aafbe9530982f659b66b (patch)
treec99667c7e5e4f51d88f46178ab67b31ea5fbf799 /src/mainboard/google
parent89e39b5c55cd7612c70cb25d2b2000965cc25539 (diff)
mainboard/google/reef: Add all DMIC endpoints
Independent of Board DMIC configuration, add all DMIC points i.e. add DMIC-1ch, DMIC-2ch, DMIC-4ch endpoints. This allows flexibility to userspace to open capture devices as needed. This is a temporary fix; once upper layers support choosing particular channels from 4-ch PCM stream, we will limit exposing only DMIC-4ch endpoint. BUG=chrome-os-partner:60444 BRANCH=none TEST=Verify All DMIC blobs are included Change-Id: I9729a3570c0668f3da4e7986291ebad6fe1de47a Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com> Reviewed-on: https://review.coreboot.org/17660 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/reef/variants/baseboard/nhlt.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/src/mainboard/google/reef/variants/baseboard/nhlt.c b/src/mainboard/google/reef/variants/baseboard/nhlt.c
index 86da039d68..d44d599e6c 100644
--- a/src/mainboard/google/reef/variants/baseboard/nhlt.c
+++ b/src/mainboard/google/reef/variants/baseboard/nhlt.c
@@ -22,18 +22,15 @@
void __attribute__((weak)) variant_nhlt_init(struct nhlt *nhlt)
{
- if (gpio_get(DMIC_CONFIG_PIN) == 1) {
- /* 1-dmic configuration */
- if (!nhlt_soc_add_dmic_array(nhlt, 1))
- printk(BIOS_ERR, "Added 1CH DMIC array.\n");
- } else {
- /* 4-dmic configuration */
- if (!nhlt_soc_add_dmic_array(nhlt, 2))
- printk(BIOS_ERR, "Added 2CH DMIC array.\n");
-
- if (!nhlt_soc_add_dmic_array(nhlt, 4))
- printk(BIOS_ERR, "Added 4CH DMIC array.\n");
- }
+ /* 1-dmic configuration */
+ if (!nhlt_soc_add_dmic_array(nhlt, 1))
+ printk(BIOS_ERR, "Added 1CH DMIC array.\n");
+ /* 2-dmic configuration */
+ if (!nhlt_soc_add_dmic_array(nhlt, 2))
+ printk(BIOS_ERR, "Added 2CH DMIC array.\n");
+ /* 4-dmic configuration */
+ if (!nhlt_soc_add_dmic_array(nhlt, 4))
+ printk(BIOS_ERR, "Added 4CH DMIC array.\n");
/* Dialog for Headset codec.
* Headset codec is bi-directional but uses the same configuration
* settings for render and capture endpoints.