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

mb/google/volteer: Add firmware configuration table 

Add the current firmware configuration table for the volteer mainboard
and define some actions based on probe results for audio:

- When I2S options are selected disable the SoundWire GPIOs.
- When SoundWire is enabled disable the I2S GPIOs.
- When no audio is enabled disable all the GPIOs.

BUG=b:147462631
TEST=Test that GPIOs are configured as expected based on the current
value of the fw_config field in cbi.

Change-Id: I179f8b6436be83a2b37911777764bd26a0d404b7
Signed-off-by: Duncan Laurie <dlaurie@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41215
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Duncan Laurie 2020-05-10 11:16:45 -07:00 committed by Duncan Laurie
parent 4dffa9cbb7
commit 9db8c2585a
4 changed files with 108 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainboard/google/volteer/Kconfig
View File

@ -15,6 +15,8 @@ config BOARD_GOOGLE_BASEBOARD_VOLTEER
select EC_GOOGLE_CHROMEEC_BOARDID
select EC_GOOGLE_CHROMEEC_SKUID
select EC_GOOGLE_CHROMEEC_LPC
select FW_CONFIG
select FW_CONFIG_SOURCE_CHROMEEC_CBI
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select INTEL_LPSS_UART_FOR_CONSOLE

1
src/mainboard/google/volteer/Makefile.inc
View File

@ -8,6 +8,7 @@ romstage-y += romstage.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c
ramstage-y += ec.c
ramstage-$(CONFIG_FW_CONFIG) += fw_config.c
ramstage-y += mainboard.c
smm-y += smihandler.c

82
src/mainboard/google/volteer/fw_config.c Normal file
View File

@ -0,0 +1,82 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <bootstate.h>
#include <console/console.h>
#include <fw_config.h>
#include <gpio.h>
static const struct pad_config dmic_enable_pads[] = {
PAD_CFG_NF(GPP_S4, NONE, DEEP, NF2), /* DMIC_CLK1 */
PAD_CFG_NF(GPP_S5, NONE, DEEP, NF2), /* DMIC_DATA1 */
PAD_CFG_NF(GPP_S6, NONE, DEEP, NF2), /* DMIC_CLK0 */
PAD_CFG_NF(GPP_S7, NONE, DEEP, NF2), /* DMIC_DATA0 */
};
static const struct pad_config dmic_disable_pads[] = {
PAD_NC(GPP_S4, NONE),
PAD_NC(GPP_S5, NONE),
PAD_NC(GPP_S6, NONE),
PAD_NC(GPP_S7, NONE),
};
static const struct pad_config sndw_enable_pads[] = {
PAD_CFG_NF(GPP_S0, NONE, DEEP, NF1), /* SNDW0_CLK */
PAD_CFG_NF(GPP_S1, NONE, DEEP, NF1), /* SNDW0_DATA */
PAD_CFG_NF(GPP_S2, NONE, DEEP, NF1), /* SNDW1_CLK */
PAD_CFG_NF(GPP_S3, NONE, DEEP, NF1), /* SNDW1_DATA */
};
static const struct pad_config sndw_disable_pads[] = {
PAD_NC(GPP_S0, NONE),
PAD_NC(GPP_S1, NONE),
PAD_NC(GPP_S2, NONE),
PAD_NC(GPP_S3, NONE),
};
static const struct pad_config i2s_enable_pads[] = {
PAD_CFG_NF(GPP_A23, NONE, DEEP, NF1), /* I2S1_SCLK */
PAD_CFG_NF(GPP_D19, NONE, DEEP, NF1), /* I2S_MCLK1 */
PAD_CFG_NF(GPP_R0, NONE, DEEP, NF2), /* I2S0_SCLK */
PAD_CFG_NF(GPP_R1, NONE, DEEP, NF2), /* I2S0_SFRM */
PAD_CFG_NF(GPP_R2, DN_20K, DEEP, NF2), /* I2S0_TXD */
PAD_CFG_NF(GPP_R3, NONE, DEEP, NF2), /* I2S0_RXD */
PAD_CFG_NF(GPP_R5, NONE, DEEP, NF2), /* I2S1_RXD */
PAD_CFG_NF(GPP_R6, NONE, DEEP, NF2), /* I2S1_TXD */
PAD_CFG_NF(GPP_R7, NONE, DEEP, NF2), /* I2S1_SFRM */
};
static const struct pad_config i2s_disable_pads[] = {
PAD_NC(GPP_A23, NONE),
PAD_NC(GPP_D19, NONE),
PAD_NC(GPP_R0, NONE),
PAD_NC(GPP_R1, NONE),
PAD_NC(GPP_R2, DN_20K),
PAD_NC(GPP_R3, NONE),
PAD_NC(GPP_R5, NONE),
PAD_NC(GPP_R6, NONE),
PAD_NC(GPP_R7, NONE),
};
static void fw_config_handle(void *unused)
{
if (fw_config_probe(FW_CONFIG(AUDIO, NONE))) {
printk(BIOS_INFO, "Configure GPIOs for no audio.\n");
gpio_configure_pads(i2s_disable_pads, ARRAY_SIZE(i2s_disable_pads));
gpio_configure_pads(dmic_disable_pads, ARRAY_SIZE(dmic_disable_pads));
gpio_configure_pads(sndw_disable_pads, ARRAY_SIZE(sndw_disable_pads));
}
if (fw_config_probe(FW_CONFIG(AUDIO, MAX98373_ALC5682_SNDW))) {
printk(BIOS_INFO, "Configure GPIOs for SoundWire audio.\n");
gpio_configure_pads(sndw_enable_pads, ARRAY_SIZE(sndw_enable_pads));
gpio_configure_pads(dmic_enable_pads, ARRAY_SIZE(dmic_enable_pads));
gpio_configure_pads(i2s_disable_pads, ARRAY_SIZE(i2s_disable_pads));
}
if (fw_config_probe(FW_CONFIG(AUDIO, MAX98357_ALC5682I_I2S)) ||
fw_config_probe(FW_CONFIG(AUDIO, MAX98373_ALC5682I_I2S))) {
printk(BIOS_INFO, "Configure GPIOs for I2S audio.\n");
gpio_configure_pads(i2s_enable_pads, ARRAY_SIZE(i2s_enable_pads));
gpio_configure_pads(dmic_enable_pads, ARRAY_SIZE(dmic_enable_pads));
gpio_configure_pads(sndw_disable_pads, ARRAY_SIZE(sndw_disable_pads));
}
}
BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);

23
src/mainboard/google/volteer/variants/baseboard/devicetree.cb
View File

@ -1,3 +1,26 @@
fw_config
field USB_DB 0 3
option NONE 0
option USB4 1
option USB3 2
end
field THERMAL 4 7 end
field AUDIO 8 10
option NONE 0
option MAX98357_ALC5682I_I2S 1
option MAX98373_ALC5682I_I2S 2
option MAX98373_ALC5682_SNDW 3
end
field TABLETMODE 11
option DISABLED 0
option ENABLED 1
end
field LTE_DB 12
option ABSENT 0
option PRESENT 1
end
end
chip soc/intel/tigerlake
device cpu_cluster 0 on