[coreboot-gerrit] New patch to review for coreboot: apollolake: remove NHLT DMIC-1ch configuration

[Sathyanarayana Nujella (sathyanarayana.nujella@intel.com)]

Sathyanarayana Nujella (sathyanarayana.nujella at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18252

-gerrit

commit b2e36fbb4010765350516ea5463960e3b4a61ae2
Author: Sathyanarayana Nujella <sathyanarayana.nujella at intel.com>
Date:   Fri Jan 27 14:51:59 2017 -0800

    apollolake: remove NHLT DMIC-1ch 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-1ch endpoint configuration will not be
    required and hence removed.
    
    BUG=chrome-os-partner:60827
    TEST=Verify internal mic capture
    
    Change-Id: Ibe81290906c9e379ae49e437648ee9cd6f123ff8
    Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella at intel.com>
---
 src/mainboard/google/reef/Kconfig                  |  1 -
 .../google/reef/variants/baseboard/nhlt.c          |  3 --
 src/soc/intel/apollolake/Kconfig                   |  7 -----
 src/soc/intel/apollolake/Makefile.inc              |  5 ----
 src/soc/intel/apollolake/nhlt.c                    | 35 ----------------------
 5 files changed, 51 deletions(-)

diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index 1ef2e88..c9f1590 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -99,7 +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
diff --git a/src/mainboard/google/reef/variants/baseboard/nhlt.c b/src/mainboard/google/reef/variants/baseboard/nhlt.c
index d44d599..f6b1362 100644
--- a/src/mainboard/google/reef/variants/baseboard/nhlt.c
+++ b/src/mainboard/google/reef/variants/baseboard/nhlt.c
@@ -22,9 +22,6 @@
 
 void __attribute__((weak)) variant_nhlt_init(struct nhlt *nhlt)
 {
-	/* 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");
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index b37cde6..9391ccf 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -217,13 +217,6 @@ config HEAP_SIZE
 	hex
 	default 0x8000
 
-config NHLT_DMIC_1CH_16B
-	bool
-	depends on ACPI_NHLT
-	default n
-	help
-	  Include DSP firmware settings for 1 channel 16B DMIC array.
-
 config NHLT_DMIC_2CH_16B
 	bool
 	depends on ACPI_NHLT
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 5a65f43..3eb5a04 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -140,16 +140,11 @@ endif
 
 # DSP firmware settings files.
 NHLT_BLOB_PATH = 3rdparty/blobs/soc/intel/apollolake/nhlt-blobs
-DMIC_1CH_48KHZ_16B = dmic-1ch-48khz-16b.bin
 DMIC_2CH_48KHZ_16B = dmic-2ch-48khz-16b.bin
 DMIC_4CH_48KHZ_16B = dmic-4ch-48khz-16b.bin
 MAX98357_RENDER = max98357-render-2ch-48khz-24b.bin
 DA7219_RENDER_CAPTURE = dialog-2ch-48khz-24b.bin
 
-cbfs-files-$(CONFIG_NHLT_DMIC_1CH_16B) += $(DMIC_1CH_48KHZ_16B)
-$(DMIC_1CH_48KHZ_16B)-file := $(NHLT_BLOB_PATH)/$(DMIC_1CH_48KHZ_16B)
-$(DMIC_1CH_48KHZ_16B)-type := raw
-
 cbfs-files-$(CONFIG_NHLT_DMIC_2CH_16B) += $(DMIC_2CH_48KHZ_16B)
 $(DMIC_2CH_48KHZ_16B)-file := $(NHLT_BLOB_PATH)/$(DMIC_2CH_48KHZ_16B)
 $(DMIC_2CH_48KHZ_16B)-type := raw
diff --git a/src/soc/intel/apollolake/nhlt.c b/src/soc/intel/apollolake/nhlt.c
index b43a34e..2ac7908 100644
--- a/src/soc/intel/apollolake/nhlt.c
+++ b/src/soc/intel/apollolake/nhlt.c
@@ -18,38 +18,6 @@
 #include <nhlt.h>
 #include <soc/nhlt.h>
 
-static const struct nhlt_format_config dmic_1ch_formats[] = {
-	/* 48 KHz 16-bits per sample. */
-	{
-		.num_channels = 1,
-		.sample_freq_khz = 48,
-		.container_bits_per_sample = 16,
-		.valid_bits_per_sample = 16,
-		.settings_file = "dmic-1ch-48khz-16b.bin",
-	},
-};
-
-static const struct nhlt_dmic_array_config dmic_1ch_mic_config = {
-	.tdm_config = {
-		.config_type = NHLT_TDM_MIC_ARRAY,
-	},
-	.array_type = NHLT_MIC_ARRAY_VENDOR_DEFINED,
-};
-
-static const struct nhlt_endp_descriptor dmic_1ch_descriptors[] = {
-	{
-		.link = NHLT_LINK_PDM,
-		.device = NHLT_PDM_DEV,
-		.direction = NHLT_DIR_CAPTURE,
-		.vid = NHLT_VID,
-		.did = NHLT_DID_DMIC,
-		.cfg = &dmic_1ch_mic_config,
-		.cfg_size = sizeof(dmic_1ch_mic_config),
-		.formats = dmic_1ch_formats,
-		.num_formats = ARRAY_SIZE(dmic_1ch_formats),
-	},
-};
-
 static const struct nhlt_format_config dmic_2ch_formats[] = {
 	/* 48 KHz 16-bits per sample. */
 	{
@@ -183,9 +151,6 @@ static const struct nhlt_endp_descriptor max98357_descriptors[] = {
 int nhlt_soc_add_dmic_array(struct nhlt *nhlt, int num_channels)
 {
 	switch (num_channels) {
-		case 1:
-			return nhlt_add_endpoints(nhlt, dmic_1ch_descriptors,
-				ARRAY_SIZE(dmic_1ch_descriptors));
 		case 2:
 			return nhlt_add_endpoints(nhlt, dmic_2ch_descriptors,
 				ARRAY_SIZE(dmic_2ch_descriptors));