google/chell: 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: Iaf910041453695b7125b254ca5d71e8ccbd0b02f Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: ea77d326ba1c33b100c34066ed361a55dfa14ce3 Original-Change-Id: I5d93c3a7fa4cf68ba91f1398b4bd04504a28fef2 Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/315520 Original-Tested-by: Duncan Laurie <dlaurie@chromium.org> Original-Reviewed-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://review.coreboot.org/12948 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
parent
5a18a0cb20
commit
3a749710cf
src/mainboard/google/chell
|
@ -55,4 +55,10 @@ config TPM_PIRQ
|
||||||
hex
|
hex
|
||||||
default 0x18 # GPP_E0_IRQ
|
default 0x18 # GPP_E0_IRQ
|
||||||
|
|
||||||
|
config INCLUDE_NHLT_BLOBS
|
||||||
|
bool "Include blobs for audio."
|
||||||
|
select NHLT_DMIC_2CH
|
||||||
|
select NHLT_NAU88L25
|
||||||
|
select NHLT_SSM4567
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -15,8 +15,11 @@
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <arch/acpi.h>
|
||||||
|
#include <console/console.h>
|
||||||
#include <device/device.h>
|
#include <device/device.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <soc/nhlt.h>
|
||||||
#include "ec.h"
|
#include "ec.h"
|
||||||
|
|
||||||
static void mainboard_init(device_t dev)
|
static void mainboard_init(device_t dev)
|
||||||
|
@ -24,6 +27,40 @@ static void mainboard_init(device_t dev)
|
||||||
mainboard_ec_init();
|
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");
|
||||||
|
|
||||||
|
/* 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
|
* mainboard_enable is executed as first thing after
|
||||||
* enumerate_buses().
|
* enumerate_buses().
|
||||||
|
@ -31,6 +68,7 @@ static void mainboard_init(device_t dev)
|
||||||
static void mainboard_enable(device_t dev)
|
static void mainboard_enable(device_t dev)
|
||||||
{
|
{
|
||||||
dev->ops->init = mainboard_init;
|
dev->ops->init = mainboard_init;
|
||||||
|
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct chip_operations mainboard_ops = {
|
struct chip_operations mainboard_ops = {
|
||||||
|
|
Loading…
Reference in New Issue