[coreboot-gerrit] Change in coreboot[master]: mb/google/volteer/halvor: Skip fw_config override on Halvor.

[Frank Wu (Code Review)]

Frank Wu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44455 )

Change subject: mb/google/volteer/halvor: Skip fw_config override on Halvor.
......................................................................

mb/google/volteer/halvor: Skip fw_config override on Halvor.

Volteer and Halvor share the same fw_config MAX98373_ALC5682I_I2S.
However, the GPP_A23 is used as I2S1_SCLK on Volteer but HP_INT_L on Halvor.
The GPP_A23 is overridden as I2S1_SCLK at last, so the detection of headset
jack is not workable.
The audio settings are included in halvor/gpio.c and skip the fw_config on
Halvor to make the gpios correct.

BUG=b:153680359, b:163382106
TEST=FW_NAME=halvor emerge-volteer coreboot chromeos-bootimage, then verify
that headset jack detection is fine on Halvor.

Signed-off-by: Frank Wu 
Change-Id: Ie644ed2b95d0e355f91d92f0b3c4ce14cd4afa98
---
M src/mainboard/google/volteer/fw_config.c
M src/mainboard/google/volteer/variants/halvor/include/variant/gpio.h
2 files changed, 5 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/44455/1

diff --git a/src/mainboard/google/volteer/fw_config.c b/src/mainboard/google/volteer/fw_config.c
index 61e20f4..21eb3e1b 100644
--- a/src/mainboard/google/volteer/fw_config.c
+++ b/src/mainboard/google/volteer/fw_config.c
@@ -4,6 +4,7 @@
 #include <console/console.h>
 #include <fw_config.h>
 #include <gpio.h>
+#include <variant/gpio.h>

static const struct pad_config dmic_enable_pads[] = {
    PAD_CFG_NF(GPP_S4, NONE, DEEP, NF2),	/* DMIC_CLK1 */
@@ -59,6 +60,9 @@

static void fw_config_handle(void *unused)
 {
+#ifdef SKIP_FW_CONFIG_GPIO
+	return;
+#endif
    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));
diff --git a/src/mainboard/google/volteer/variants/halvor/include/variant/gpio.h b/src/mainboard/google/volteer/variants/halvor/include/variant/gpio.h
index fe512d8..ce32b3b 100644
--- a/src/mainboard/google/volteer/variants/halvor/include/variant/gpio.h
+++ b/src/mainboard/google/volteer/variants/halvor/include/variant/gpio.h
@@ -5,6 +5,7 @@

#include <baseboard/gpio.h>

+#define SKIP_FW_CONFIG_GPIO	1
 #undef GPIO_EC_IN_RW
 /* EC in RW */
 #define GPIO_EC_IN_RW		GPP_F17