[coreboot-gerrit] Patch set updated for coreboot: mainboard/google/reef: Use common NHLT

[Saurabh Satija (saurabh.satija@intel.com)]

Saurabh Satija (saurabh.satija at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15440

-gerrit

commit cea6c9cfc3ac229266bd1892f206c17af1c46b9d
Author: Saurabh Satija <saurabh.satija at intel.com>
Date:   Sun Jun 26 18:25:34 2016 -0700

    mainboard/google/reef: Use common NHLT
    
    Add ACPI NHLT table generation that the current hardware
    supports.
    
    Reef supports two audio codecs, Dialog 7219 for headsets
    and Maxim 98357 for speakers.
    
    Change-Id: Ie39947960c86b8f65140834e31f9ed9f1b578485
    Signed-off-by: Saurabh Satija <saurabh.satija at intel.com>
---
 src/mainboard/google/reef/dsdt.asl    |  1 +
 src/mainboard/google/reef/mainboard.c | 47 +++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/src/mainboard/google/reef/dsdt.asl b/src/mainboard/google/reef/dsdt.asl
index e48db4b..7a88fb6 100644
--- a/src/mainboard/google/reef/dsdt.asl
+++ b/src/mainboard/google/reef/dsdt.asl
@@ -33,6 +33,7 @@ DefinitionBlock(
 		{
 			#include <soc/intel/apollolake/acpi/northbridge.asl>
 			#include <soc/intel/apollolake/acpi/southbridge.asl>
+			#include <soc/intel/apollolake/acpi/pch_hda.asl>
 		}
 	}
 
diff --git a/src/mainboard/google/reef/mainboard.c b/src/mainboard/google/reef/mainboard.c
index 31bf9c8..10b3df4 100644
--- a/src/mainboard/google/reef/mainboard.c
+++ b/src/mainboard/google/reef/mainboard.c
@@ -14,7 +14,11 @@
  */
 
 #include <device/device.h>
+#include <arch/acpi.h>
+#include <console/console.h>
+#include <nhlt.h>
 #include <soc/gpio.h>
+#include <soc/nhlt.h>
 #include "ec.h"
 #include "gpio.h"
 
@@ -24,6 +28,49 @@ static void mainboard_init(void *chip_info)
 	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_add_dmic_array(nhlt))
+		printk(BIOS_ERR, "Added 2CH DMIC array.\n");
+
+	/* Dialog for Headset codec.
+	 * Headset codec is bi-directional but uses the same configuration
+	 * settings for render and capture endpoints.
+	 */
+	if (!nhlt_add_da7219_on_ssp(nhlt, AUDIO_LINK_SSP1))
+		printk(BIOS_ERR, "Added Dialog_7219 codec.\n");
+
+	/* MAXIM Smart Amps for left and right speakers. */
+	if (!nhlt_add_max98357_on_ssp(nhlt, AUDIO_LINK_SSP5))
+		printk(BIOS_ERR, "Added Maxim_98357 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;
+}
+
+static void mainboard_enable(device_t dev)
+{
+	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
+}
+
 struct chip_operations mainboard_ops = {
 	.init = mainboard_init,
+	.enable_dev = mainboard_enable,
 };