From fccc24f063acb2470ba919237b0056c6afecd4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Niew=C3=B6hner?= Date: Mon, 21 Dec 2020 17:09:08 +0100 Subject: [PATCH] mb/intel/glkrvp: do LPC/eSPI pad configuration at board-level MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do LPC/eSPI pad configuration at board-level to match other platforms. This is done by adding one missing pad to the early gpio table and dropping the call to the soc function. The soc code gets dropped in CB:49410. Change-Id: I210633d4520fcfab59f68268bd7991557433ce38 Signed-off-by: Michael Niewöhner Reviewed-on: https://review.coreboot.org/c/coreboot/+/49415 Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- src/mainboard/intel/glkrvp/bootblock.c | 2 -- src/mainboard/intel/glkrvp/variants/baseboard/gpio.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mainboard/intel/glkrvp/bootblock.c b/src/mainboard/intel/glkrvp/bootblock.c index 3e9f51afd0..577dae507d 100644 --- a/src/mainboard/intel/glkrvp/bootblock.c +++ b/src/mainboard/intel/glkrvp/bootblock.c @@ -3,7 +3,6 @@ #include #include #include -#include #include #include @@ -12,7 +11,6 @@ void bootblock_mainboard_init(void) const struct pad_config *pads; size_t num; - lpc_configure_pads(); pads = variant_early_gpio_table(&num); gpio_configure_pads(pads, num); mainboard_ec_init(); diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c b/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c index 56df526056..28efde9bdb 100644 --- a/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c +++ b/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c @@ -236,6 +236,7 @@ const struct pad_config * __weak variant_gpio_table(size_t *num) static const struct pad_config early_gpio_table[] = { PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_177, UP_20K, DEEP, NF1), /* SMB_CLK */ PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_178, UP_20K, DEEP, NF1), /* SMB_DATA */ + PAD_NC(GPIO_154, NONE), /* LPC_CLKRUNB -- NC for eSPI */ }; const struct pad_config * __weak