summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/reef/Kconfig2
-rw-r--r--src/mainboard/google/reef/variants/baseboard/nhlt.c9
2 files changed, 6 insertions, 5 deletions
diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index 1ef2e8858a..f37b7b4eff 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -99,8 +99,6 @@ config UART_FOR_CONSOLE
config INCLUDE_NHLT_BLOBS
bool "Include blobs for audio."
- select NHLT_DMIC_1CH_16B
- select NHLT_DMIC_2CH_16B
select NHLT_DMIC_4CH_16B
select NHLT_DA7219
select NHLT_MAX98357
diff --git a/src/mainboard/google/reef/variants/baseboard/nhlt.c b/src/mainboard/google/reef/variants/baseboard/nhlt.c
index d44d599e6c..b9357962df 100644
--- a/src/mainboard/google/reef/variants/baseboard/nhlt.c
+++ b/src/mainboard/google/reef/variants/baseboard/nhlt.c
@@ -23,13 +23,16 @@
void __attribute__((weak)) variant_nhlt_init(struct nhlt *nhlt)
{
/* 1-dmic configuration */
- if (!nhlt_soc_add_dmic_array(nhlt, 1))
+ if (IS_ENABLED(CONFIG_NHLT_DMIC_1CH_16B) &&
+ (!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))
+ if (IS_ENABLED(CONFIG_NHLT_DMIC_2CH_16B) &&
+ (!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))
+ if (IS_ENABLED(CONFIG_NHLT_DMIC_4CH_16B) &&
+ (!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