diff options
| author | Sathyanarayana Nujella <sathyanarayana.nujella@intel.com> | 2017-01-27 14:51:59 -0800 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2017-01-31 15:17:53 +0100 |
| commit | 545edca5779c2f6b057fc38f6371351ea762c5bd (patch) | |
| tree | 696484c95d57f99d2f99b3e025443c7f0ca5b063 | |
| parent | 6e5609124eb98b2f3e33fcec994b7d1b00a355ef (diff) | |
mainboard/google/reef: remove NHLT DMIC 1ch and 2ch configuration
Apollolake boards should use DMIC-4ch configuration in Kernel side and
use CaptureChannelMap in userspace to distinguish boards with different
number of DMIC's. So, NHLT DMIC 1-ch & 2-ch endpoint configuration will
not be required and hence removed.
BUG=chrome-os-partner:60827
TEST=Verify internal mic capture
TEST='arecord -Dhw:0,3 dmic_4ch.wav -f S16_LE -r 48000 -c 4 -d 10' works
Change-Id: Ibe81290906c9e379ae49e437648ee9cd6f123ff8
Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>
Reviewed-on: https://review.coreboot.org/18252
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
| -rw-r--r-- | src/mainboard/google/reef/Kconfig | 2 | ||||
| -rw-r--r-- | src/mainboard/google/reef/variants/baseboard/nhlt.c | 9 |
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 |