diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2017-04-13 01:40:53 -0700 |
|---|---|---|
| committer | Duncan Laurie <dlaurie@chromium.org> | 2017-04-14 04:21:37 +0200 |
| commit | e49b866c7cd67202853cd6e2177a294b9ab0c056 (patch) | |
| tree | 164f12761d23c7f431e931545c26a6bb6acfd18d | |
| parent | 30783d84cffcb5a997e8d0f4061e3a7962b6417c (diff) | |
| download | coreboot-e49b866c7cd67202853cd6e2177a294b9ab0c056.tar.xz | |
mainboard/google/eve: Set UART0 to skip initialization in FSP
Set UART0 to "PchSerialIoSkipInit" so the pins for this device are not
set back to native mode by FSP when configured as GPIO input by coreboot.
Now that FSP is not touching the pins I also removed the workaround to
reconfigure the pins after FSP.
BUG=b:35647877
BRANCH=none
TEST=Verify that GPP_C8-GPP_C11 are configured as GPIO input once the OS
is booted and they are not set back to native function by FSP.
Change-Id: Ifec4fa3e66ceeb660bad00c66bc7bd44bb457a01
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://review.coreboot.org/19264
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins)
Reviewed-by: Furquan Shaikh <furquan@google.com>
| -rw-r--r-- | src/mainboard/google/eve/devicetree.cb | 2 | ||||
| -rw-r--r-- | src/mainboard/google/eve/gpio.h | 7 | ||||
| -rw-r--r-- | src/mainboard/google/eve/mainboard.c | 4 |
3 files changed, 1 insertions, 12 deletions
diff --git a/src/mainboard/google/eve/devicetree.cb b/src/mainboard/google/eve/devicetree.cb index 7db97b7354..99ddb2edea 100644 --- a/src/mainboard/google/eve/devicetree.cb +++ b/src/mainboard/google/eve/devicetree.cb @@ -204,7 +204,7 @@ chip soc/intel/skylake [PchSerialIoIndexI2C5] = PchSerialIoDisabled, [PchSerialIoIndexSpi0] = PchSerialIoPci, [PchSerialIoIndexSpi1] = PchSerialIoPci, - [PchSerialIoIndexUart0] = PchSerialIoPci, + [PchSerialIoIndexUart0] = PchSerialIoSkipInit, [PchSerialIoIndexUart1] = PchSerialIoDisabled, [PchSerialIoIndexUart2] = PchSerialIoSkipInit, }" diff --git a/src/mainboard/google/eve/gpio.h b/src/mainboard/google/eve/gpio.h index c4c73aecfa..6da82441bd 100644 --- a/src/mainboard/google/eve/gpio.h +++ b/src/mainboard/google/eve/gpio.h @@ -231,13 +231,6 @@ static const struct pad_config early_gpio_table[] = { /* UART2_TXD */ PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1), /* SERVO */ }; -static const struct pad_config late_gpio_table[] = { -/* UART0_RXD */ PAD_CFG_GPI(GPP_C8, NONE, PLTRST), /* FP_INT */ -/* UART0_TXD */ PAD_CFG_GPI(GPP_C9, NONE, DEEP), /* FP_RST_ODL */ -/* UART0_RTS# */ PAD_CFG_GPI(GPP_C10, NONE, DEEP), /* PCH_FPS_MCU_NRST_ODL */ -/* UART0_CTS# */ PAD_CFG_GPI(GPP_C11, NONE, DEEP), /* PCH_FPS_MCU_BOOT0 */ -}; - #endif #endif diff --git a/src/mainboard/google/eve/mainboard.c b/src/mainboard/google/eve/mainboard.c index dda0cfacfd..d30eff26e6 100644 --- a/src/mainboard/google/eve/mainboard.c +++ b/src/mainboard/google/eve/mainboard.c @@ -19,10 +19,7 @@ #include <device/device.h> #include <ec/ec.h> #include <vendorcode/google/chromeos/chromeos.h> -#include <gpio.h> -#include <soc/gpio.h> #include <soc/nhlt.h> -#include "gpio.h" static const char *oem_id_maxim = "GOOGLE"; static const char *oem_table_id_maxim = "EVEMAX"; @@ -30,7 +27,6 @@ static const char *oem_table_id_maxim = "EVEMAX"; static void mainboard_init(device_t dev) { mainboard_ec_init(); - gpio_configure_pads(late_gpio_table, ARRAY_SIZE(late_gpio_table)); } static unsigned long mainboard_write_acpi_tables( |