GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mainboard/google/reef: add baseboard nhlt configuration 

Move the current NHLT configuration implementation to the baseboard
area such that other variants can leverage it or provide their
own configuration.

BUG=chrome-os-partner:56677

Change-Id: If0d48cacdc793492e1618d0eda02a149e33f0650
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/16431
Tested-by: build bot (Jenkins)
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
This commit is contained in:
Aaron Durbin 2016-09-02 20:19:59 -05:00
parent d94967dd22
commit 8db1f8dabb
4 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mainboard/google/reef/mainboard.c
View File

@ -56,20 +56,7 @@ static unsigned long mainboard_write_acpi_tables(
if (nhlt == NULL) if (nhlt == NULL)
return start_addr; return start_addr;
/* 2 Channel DMIC array. */ variant_nhlt_init(nhlt);
if (!nhlt_soc_add_dmic_array(nhlt, 2))
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_soc_add_da7219(nhlt, AUDIO_LINK_SSP1))
printk(BIOS_ERR, "Added Dialog_7219 codec.\n");
/* MAXIM Smart Amps for left and right speakers. */
if (!nhlt_soc_add_max98357(nhlt, AUDIO_LINK_SSP5))
printk(BIOS_ERR, "Added Maxim_98357 codec.\n");
end_addr = nhlt_soc_serialize(nhlt, start_addr); end_addr = nhlt_soc_serialize(nhlt, start_addr);

1
src/mainboard/google/reef/variants/baseboard/Makefile.inc
View File

@ -5,5 +5,6 @@ romstage-y += memory.c
ramstage-y += boardid.c ramstage-y += boardid.c
ramstage-y += gpio.c ramstage-y += gpio.c
ramstage-y += nhlt.c
smm-y += gpio.c smm-y += gpio.c

4
src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h
View File

@ -40,4 +40,8 @@ size_t variant_memory_sku(void);
/* Return ChromeOS gpio table and fill in number of entries. */ /* Return ChromeOS gpio table and fill in number of entries. */
const struct cros_gpio *variant_cros_gpios(size_t *num); const struct cros_gpio *variant_cros_gpios(size_t *num);
/* Seed the NHLT tables with the board specific information. */
struct nhlt;
void variant_nhlt_init(struct nhlt *nhlt);
#endif /* BASEBOARD_VARIANTS_H */ #endif /* BASEBOARD_VARIANTS_H */

37
src/mainboard/google/reef/variants/baseboard/nhlt.c Normal file
View File

@ -0,0 +1,37 @@
/*
* This file is part of the coreboot project.
*
* Copyright 2016 Google Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include <baseboard/variants.h>
#include <console/console.h>
#include <nhlt.h>
#include <soc/nhlt.h>
void __attribute__((weak)) variant_nhlt_init(struct nhlt *nhlt)
{
/* 2 Channel DMIC array. */
if (!nhlt_soc_add_dmic_array(nhlt, 2))
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_soc_add_da7219(nhlt, AUDIO_LINK_SSP1))
printk(BIOS_ERR, "Added Dialog_7219 codec.\n");
/* MAXIM Smart Amps for left and right speakers. */
if (!nhlt_soc_add_max98357(nhlt, AUDIO_LINK_SSP5))
printk(BIOS_ERR, "Added Maxim_98357 codec.\n");
}