[coreboot-gerrit] New patch to review for coreboot: google/glados: add nhlt support

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12939

-gerrit

commit 83370e55b702a1ce6c492261ac1fc0a72cb544a9
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Mon Nov 30 15:01:39 2015 -0600

    google/glados: add nhlt support
    
    Provide an option for including the NHLT blobs within the
    glados mainboard directory while also adding the ACPI NHLT
    table generation that the current hardware supports.
    
    BUG=chrome-os-partner:44481
    BRANCH=None
    TEST=Built and booted. Headphones, speakers, and mic on camera
         emits and creates sound albeit not the greatest.
    
    Change-Id: I6e36c0a99a73cdcb2bf6ccfbfc886a594f989a39
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 5b0383a93f054011dd7c18519ece4e6f1944366d
    Original-Change-Id: I6f8bd15c72fa89756382af99bddb6cb6abe89905
    Original-Signed-off-by: Aaron Durbin <adurbin at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/313794
    Original-Reviewed-by: Duncan Laurie <dlaurie at chromium.org>
---
 src/mainboard/google/glados/Kconfig     |  7 ++++++
 src/mainboard/google/glados/mainboard.c | 42 +++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index 1bea9fd..77e1a68 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -55,4 +55,11 @@ config TPM_PIRQ
 	hex
 	default 0x18  # GPP_E0_IRQ
 
+config INCLUDE_NHLT_BLOBS
+	bool "Include blobs for audio."
+	select NHLT_DMIC_2CH
+	select NHLT_DMIC_4CH
+	select NHLT_NAU88L25
+	select NHLT_SSM4567
+
 endif
diff --git a/src/mainboard/google/glados/mainboard.c b/src/mainboard/google/glados/mainboard.c
index 37c626c..d387fef 100644
--- a/src/mainboard/google/glados/mainboard.c
+++ b/src/mainboard/google/glados/mainboard.c
@@ -15,8 +15,11 @@
  * GNU General Public License for more details.
  */
 
+#include <arch/acpi.h>
+#include <console/console.h>
 #include <device/device.h>
 #include <stdlib.h>
+#include <soc/nhlt.h>
 #include "ec.h"
 
 static void mainboard_init(device_t dev)
@@ -24,6 +27,44 @@ static void mainboard_init(device_t dev)
 	mainboard_ec_init();
 }
 
+static unsigned long mainboard_write_acpi_tables(
+	device_t device, unsigned long current, acpi_rsdp_t *rsdp)
+{
+	uintptr_t start_addr;
+	uintptr_t end_addr;
+	struct nhlt *nhlt;
+
+	start_addr = current;
+
+	nhlt = nhlt_init();
+
+	if (nhlt == NULL)
+		return start_addr;
+
+	/* 2 Channel DMIC array. */
+	if (nhlt_soc_add_dmic_array(nhlt, 2))
+		printk(BIOS_ERR, "Couldn't add 2CH DMIC array.\n");
+
+	/* 4 Channel DMIC array. */
+	if (nhlt_soc_add_dmic_array(nhlt, 4))
+		printk(BIOS_ERR, "Couldn't add 4CH DMIC arrays.\n");
+
+	/* ADI Smart Amps for left and right. */
+	if (nhlt_soc_add_ssm4567(nhlt, AUDIO_LINK_SSP0))
+		printk(BIOS_ERR, "Couldn't add ssm4567.\n");
+
+	/* NAU88l25 Headset codec. */
+	if (nhlt_soc_add_nau88l25(nhlt, AUDIO_LINK_SSP1))
+		printk(BIOS_ERR, "Couldn't add headset codec.\n");
+
+	end_addr = nhlt_soc_serialize(nhlt, start_addr);
+
+	if (end_addr != start_addr)
+		acpi_add_table(rsdp, (void *)start_addr);
+
+	return end_addr;
+}
+
 /*
  * mainboard_enable is executed as first thing after
  * enumerate_buses().
@@ -31,6 +72,7 @@ static void mainboard_init(device_t dev)
 static void mainboard_enable(device_t dev)
 {
 	dev->ops->init = mainboard_init;
+	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
 }
 
 struct chip_operations mainboard_ops = {