diff options
| author | David Wu <david_wu@quanta.corp-partner.google.com> | 2018-09-14 21:30:39 +0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-10-19 09:24:18 +0000 |
| commit | 80496f09670095acce4c7a002c28af5d6bc9198c (patch) | |
| tree | 953426f57012274b05da064fbe804753de705691 /src/mainboard/google/fizz/mainboard.c | |
| parent | eaab80efaf36d7a97f611229c1c6558b7217dd07 (diff) | |
mb/google/fizz: Provide nhlt variant API
Move current NHLT configuration implementation to baseboard so that
variants can leverage it or provide their own configuration.
BUG=b:117066935
BRANCH=Fizz
TEST=emerge-fizz coreboot
Change-Id: I30d93babb6fc09e8642b3740f1f7638fa33f0ade
Signed-off-by: David Wu <david_wu@quanta.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/28965
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/mainboard/google/fizz/mainboard.c')
| -rw-r--r-- | src/mainboard/google/fizz/mainboard.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mainboard/google/fizz/mainboard.c b/src/mainboard/google/fizz/mainboard.c index 9865f407e1..5670936021 100644 --- a/src/mainboard/google/fizz/mainboard.c +++ b/src/mainboard/google/fizz/mainboard.c @@ -14,7 +14,7 @@ */ #include <arch/acpi.h> -#include <console/console.h> +#include <baseboard/variants.h> #include <chip.h> #include <device/device.h> #include <ec/ec.h> @@ -194,8 +194,9 @@ static void mainboard_init(struct device *dev) static unsigned long mainboard_write_acpi_tables( struct device *device, unsigned long current, acpi_rsdp_t *rsdp) { - const char *oem_id = "GOOGLE"; - const char *oem_table_id = "FIZZ"; + const char *oem_id = NULL; + const char *oem_table_id = NULL; + uint32_t oem_revision = 0; uintptr_t start_addr; uintptr_t end_addr; struct nhlt *nhlt; @@ -206,12 +207,11 @@ static unsigned long mainboard_write_acpi_tables( if (!nhlt) return start_addr; - /* RT5663 Headset codec */ - if (nhlt_soc_add_rt5663(nhlt, AUDIO_LINK_SSP1)) - printk(BIOS_ERR, "Couldn't add headset codec.\n"); + variant_nhlt_init(nhlt); + variant_nhlt_oem_overrides(&oem_id, &oem_table_id, &oem_revision); end_addr = nhlt_soc_serialize_oem_overrides(nhlt, start_addr, - oem_id, oem_table_id, 0); + oem_id, oem_table_id, oem_revision); if (end_addr != start_addr) acpi_add_table(rsdp, (void *)start_addr); |