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>
This commit is contained in:
parent
6e5609124e
commit
545edca577
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue