From 89d2aa0cdc43a85258ff6b6ca2c781339081025a Mon Sep 17 00:00:00 2001 From: Maxim Polyakov Date: Sun, 26 Apr 2020 20:56:50 +0300 Subject: mb/tiogapass: use common driver to configure GPIO According to changes in the soc/xeon_sp code [1,2], server motherboards with Lewisburg PCH can use the soc/intel/common/gpio driver to configure GPIO controller. This patch adds pads configuration map, which has the format required by the GPIO driver. The data for this was taken from the inteltool register dump with AMI firmware. The gpio.h file with pad configuration was generated automatically using the util/intelp2m [3]: ./intelp2m -raw -p lbg -file tiogapass/vendorbios/inteltool_gpio.log [1] https: //review.coreboot.org/c/coreboot/+/39425 [2] https: //review.coreboot.org/c/coreboot/+/39428 [3] https: //review.coreboot.org/c/coreboot/+/35643 Change-Id: I818d040fa33f3e7b94b73c9bbbafca5df424616d Signed-off-by: Maxim Polyakov Reviewed-on: https://review.coreboot.org/c/coreboot/+/39427 Reviewed-by: Andrey Petrov Tested-by: build bot (Jenkins) --- src/mainboard/ocp/tiogapass/bootblock.c | 4 + src/mainboard/ocp/tiogapass/gpio.h | 544 ++++++++++++++++++++++++++++++++ src/mainboard/ocp/tiogapass/romstage.c | 16 +- 3 files changed, 552 insertions(+), 12 deletions(-) create mode 100644 src/mainboard/ocp/tiogapass/gpio.h diff --git a/src/mainboard/ocp/tiogapass/bootblock.c b/src/mainboard/ocp/tiogapass/bootblock.c index 67808ef72a..dbb3b6a93f 100644 --- a/src/mainboard/ocp/tiogapass/bootblock.c +++ b/src/mainboard/ocp/tiogapass/bootblock.c @@ -10,6 +10,7 @@ #include #include #include +#include "gpio.h" /* these are defined in intelblocks/lpc_lib.h but we can't use them yet */ #define PCR_DMI_LPCIOD 0x2770 @@ -53,6 +54,9 @@ static uint8_t com_to_ast_sio(uint8_t com) void bootblock_mainboard_early_init(void) { + /* pre-configure Lewisburg PCH GPIO pads */ + gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table)); + /* Open IO windows */ enable_espi_lpc_io_windows(); diff --git a/src/mainboard/ocp/tiogapass/gpio.h b/src/mainboard/ocp/tiogapass/gpio.h new file mode 100644 index 0000000000..823f7972fb --- /dev/null +++ b/src/mainboard/ocp/tiogapass/gpio.h @@ -0,0 +1,544 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* This file is part of the coreboot project. */ + +#ifndef CFG_PCH_GPIO_H +#define CFG_PCH_GPIO_H + +#include + +/* Pad configuration */ +static const struct pad_config gpio_table[] = { + /* ------- GPIO Community 0 ------- */ + /* ------- GPIO Group GPP_A ------- */ + /* GPP_A0 - GPIO */ + _PAD_CFG_STRUCT(GPP_A0, 0x44000102, 0x00000010), + /* GPP_A1 - LAD0 */ + _PAD_CFG_STRUCT(GPP_A1, 0x44000402, 0x00000010), + /* GPP_A2 - LAD1 */ + _PAD_CFG_STRUCT(GPP_A2, 0x44000402, 0x00000010), + /* GPP_A3 - LAD2 */ + _PAD_CFG_STRUCT(GPP_A3, 0x44000402, 0x00000010), + /* GPP_A4 - LAD3 */ + _PAD_CFG_STRUCT(GPP_A4, 0x44000402, 0x00000010), + /* GPP_A5 - LFRAME# */ + _PAD_CFG_STRUCT(GPP_A5, 0x44000600, 0x00000010), + /* GPP_A6 - SERIRQ */ + _PAD_CFG_STRUCT(GPP_A6, 0x44000502, 0x00000010), + /* GPP_A7 - PIRQA# */ + _PAD_CFG_STRUCT(GPP_A7, 0x44000502, 0x00000010), + /* GPP_A8 - CLKRUN# */ + _PAD_CFG_STRUCT(GPP_A8, 0x44000500, 0x00000010), + /* GPP_A9 - CLKOUT_LPC0 */ + _PAD_CFG_STRUCT(GPP_A9, 0x44000600, 0x00000010), + /* GPP_A10 - GPIO */ + _PAD_CFG_STRUCT(GPP_A10, 0x44000102, 0x00000010), + /* GPP_A11 - GPIO */ + _PAD_CFG_STRUCT(GPP_A11, 0x44000102, 0x00000010), + /* GPP_A12 - GPIO */ + _PAD_CFG_STRUCT(GPP_A12, 0x84000102, 0x00000010), + /* GPP_A13 - GPIO */ + _PAD_CFG_STRUCT(GPP_A13, 0x44000102, 0x00000010), + /* GPP_A14 - GPIO */ + _PAD_CFG_STRUCT(GPP_A14, 0x44000102, 0x00000010), + /* GPP_A15 - GPIO */ + _PAD_CFG_STRUCT(GPP_A15, 0x44000102, 0x00000010), + /* GPP_A16 - GPIO */ + _PAD_CFG_STRUCT(GPP_A16, 0x44000102, 0x00000010), + /* GPP_A17 - GPIO */ + _PAD_CFG_STRUCT(GPP_A17, 0x44000102, 0x00000010), + /* GPP_A18 - GPIO */ + _PAD_CFG_STRUCT(GPP_A18, 0x44000102, 0x00000010), + /* GPP_A19 - RESERVED */ + /* GPP_A20 - GPIO */ + _PAD_CFG_STRUCT(GPP_A20, 0x44000102, 0x00000010), + /* GPP_A21 - GPIO */ + _PAD_CFG_STRUCT(GPP_A21, 0x44000201, 0x00000010), + /* GPP_A22 - GPIO */ + _PAD_CFG_STRUCT(GPP_A22, 0x44000102, 0x00000010), + /* GPP_A23 - GPIO */ + _PAD_CFG_STRUCT(GPP_A23, 0x44000100, 0x00000010), + + /* ------- GPIO Group GPP_B ------- */ + /* GPP_B0 - CORE_VID0 */ + _PAD_CFG_STRUCT(GPP_B0, 0x44000600, 0x00000010), + /* GPP_B1 - CORE_VID1 */ + _PAD_CFG_STRUCT(GPP_B1, 0x44000600, 0x00000010), + /* GPP_B2 - GPIO */ + _PAD_CFG_STRUCT(GPP_B2, 0x44000102, 0x00000010), + /* GPP_B3 - GPIO */ + _PAD_CFG_STRUCT(GPP_B3, 0x44000102, 0x00000010), + /* GPP_B4 - GPIO */ + _PAD_CFG_STRUCT(GPP_B4, 0x44000102, 0x00000010), + /* GPP_B5 - GPIO */ + _PAD_CFG_STRUCT(GPP_B5, 0x44000102, 0x00000010), + /* GPP_B6 - GPIO */ + _PAD_CFG_STRUCT(GPP_B6, 0x84000102, 0x00000010), + /* GPP_B7 - GPIO */ + _PAD_CFG_STRUCT(GPP_B7, 0x84000102, 0x00000010), + /* GPP_B8 - GPIO */ + _PAD_CFG_STRUCT(GPP_B8, 0x44000102, 0x00000010), + /* GPP_B9 - GPIO */ + _PAD_CFG_STRUCT(GPP_B9, 0x44000102, 0x00000010), + /* GPP_B10 - GPIO */ + _PAD_CFG_STRUCT(GPP_B10, 0x44000102, 0x00000010), + /* GPP_B11 - GPIO */ + _PAD_CFG_STRUCT(GPP_B11, 0x44000201, 0x00000010), + /* GPP_B12 - GLB_RST_WARN_N# */ + _PAD_CFG_STRUCT(GPP_B12, 0x44000600, 0x00000010), + /* GPP_B13 - PLTRST# */ + _PAD_CFG_STRUCT(GPP_B13, 0x44000600, 0x00000010), + /* GPP_B14 - SPKR */ + _PAD_CFG_STRUCT(GPP_B14, 0x44000600, 0x00000010), + /* GPP_B15 - GPIO */ + _PAD_CFG_STRUCT(GPP_B15, 0x44000102, 0x00000010), + /* GPP_B16 - GPIO */ + _PAD_CFG_STRUCT(GPP_B16, 0x44000102, 0x00000010), + /* GPP_B17 - GPIO */ + _PAD_CFG_STRUCT(GPP_B17, 0x44000102, 0x00000010), + /* GPP_B18 - GPIO */ + _PAD_CFG_STRUCT(GPP_B18, 0x44000102, 0x00000010), + /* GPP_B19 - GPIO */ + _PAD_CFG_STRUCT(GPP_B19, 0x44000201, 0x00000010), + /* GPP_B20 - GPIO */ + _PAD_CFG_STRUCT(GPP_B20, 0x44000200, 0x00000010), + /* GPP_B21 - GPIO */ + _PAD_CFG_STRUCT(GPP_B21, 0x44000100, 0x00000010), + /* GPP_B22 - GPIO */ + _PAD_CFG_STRUCT(GPP_B22, 0x44000200, 0x00000010), + /* GPP_B23 - PCHHOT# */ + _PAD_CFG_STRUCT(GPP_B23, 0x00000a00, 0x00000010), + + /* ------- GPIO Group GPP_F ------- */ + /* GPP_F0 - GPIO */ + _PAD_CFG_STRUCT(GPP_F0, 0x44000102, 0x00000010), + /* GPP_F1 - GPIO */ + _PAD_CFG_STRUCT(GPP_F1, 0x44000102, 0x00000010), + /* GPP_F2 - GPIO */ + _PAD_CFG_STRUCT(GPP_F2, 0x44000102, 0x00000010), + /* GPP_F3 - GPIO */ + _PAD_CFG_STRUCT(GPP_F3, 0x44000102, 0x00000010), + /* GPP_F4 - GPIO */ + _PAD_CFG_STRUCT(GPP_F4, 0x44000100, 0x00000010), + /* GPP_F5 - GPIO */ + _PAD_CFG_STRUCT(GPP_F5, 0x44000101, 0x00000010), + /* GPP_F6 - GPIO */ + _PAD_CFG_STRUCT(GPP_F6, 0x84000200, 0x00000010), + /* GPP_F7 - GPIO */ + _PAD_CFG_STRUCT(GPP_F7, 0x84000200, 0x00000010), + /* GPP_F8 - GPIO */ + _PAD_CFG_STRUCT(GPP_F8, 0x84000200, 0x00000010), + /* GPP_F9 - GPIO */ + _PAD_CFG_STRUCT(GPP_F9, 0x84000102, 0x00000010), + /* GPP_F10 - SATA_SCLOCK */ + _PAD_CFG_STRUCT(GPP_F10, 0x44000600, 0x00000010), + /* GPP_F11 - SATA_SLOAD */ + _PAD_CFG_STRUCT(GPP_F11, 0x44000600, 0x00000010), + /* GPP_F12 - GPIO */ + _PAD_CFG_STRUCT(GPP_F12, 0x44000102, 0x00000010), + /* GPP_F13 - SATA_SDATAOUT2 */ + _PAD_CFG_STRUCT(GPP_F13, 0x44000600, 0x00000010), + /* GPP_F14 - SSATA_LED# */ + _PAD_CFG_STRUCT(GPP_F14, 0x44000e00, 0x00000010), + /* GPP_F15 - GPIO */ + _PAD_CFG_STRUCT(GPP_F15, 0x44000102, 0x00000010), + /* GPP_F16 - GPIO */ + _PAD_CFG_STRUCT(GPP_F16, 0x44000100, 0x00000010), + /* GPP_F17 - GPIO */ + _PAD_CFG_STRUCT(GPP_F17, 0x44000100, 0x00000010), + /* GPP_F18 - GPIO */ + _PAD_CFG_STRUCT(GPP_F18, 0x44000102, 0x00000010), + /* GPP_F19 - LAN_SMBCLK */ + _PAD_CFG_STRUCT(GPP_F19, 0x44000502, 0x00000010), + /* GPP_F20 - LAN_SMBDATA */ + _PAD_CFG_STRUCT(GPP_F20, 0x44000502, 0x00000010), + /* GPP_F21 - LAN_SMBALRT# */ + _PAD_CFG_STRUCT(GPP_F21, 0x44000602, 0x00000010), + /* GPP_F22 - SSATA_SCLOCK */ + _PAD_CFG_STRUCT(GPP_F22, 0x44000e00, 0x00000010), + /* GPP_F23 - SSATA_SLOAD */ + _PAD_CFG_STRUCT(GPP_F23, 0x44000e00, 0x00000010), + + /* ------- GPIO Community 1 ------- */ + /* ------- GPIO Group GPP_C ------- */ + /* GPP_C0 - RESERVED */ + /* GPP_C1 - RESERVED */ + /* GPP_C2 - SMBALERT# */ + _PAD_CFG_STRUCT(GPP_C2, 0x44000502, 0x00000010), + /* GPP_C3 - RESERVED */ + /* GPP_C4 - RESERVED */ + /* GPP_C5 - GPIO */ + _PAD_CFG_STRUCT(GPP_C5, 0x44000200, 0x00000000), + /* GPP_C6 - RESERVED */ + /* GPP_C7 - RESERVED */ + /* GPP_C8 - GPIO */ + _PAD_CFG_STRUCT(GPP_C8, 0x44000102, 0x00000010), + /* GPP_C9 - GPIO */ + _PAD_CFG_STRUCT(GPP_C9, 0x44000201, 0x00000010), + /* GPP_C10 - GPIO */ + _PAD_CFG_STRUCT(GPP_C10, 0x86000103, 0x00000000), + /* GPP_C11 - GPIO */ + _PAD_CFG_STRUCT(GPP_C11, 0x44000100, 0x00000010), + /* GPP_C12 - GPIO */ + _PAD_CFG_STRUCT(GPP_C12, 0x44000103, 0x00000010), + /* GPP_C13 - GPIO */ + _PAD_CFG_STRUCT(GPP_C13, 0x44000103, 0x00000010), + /* GPP_C14 - GPIO */ + _PAD_CFG_STRUCT(GPP_C14, 0x80080102, 0x00000000), + /* GPP_C15 - GPIO */ + _PAD_CFG_STRUCT(GPP_C15, 0x44000102, 0x00000010), + /* GPP_C16 - GPIO */ + _PAD_CFG_STRUCT(GPP_C16, 0x44000102, 0x00000010), + /* GPP_C17 - GPIO */ + _PAD_CFG_STRUCT(GPP_C17, 0x44000102, 0x00000010), + /* GPP_C18 - GPIO */ + _PAD_CFG_STRUCT(GPP_C18, 0x44000100, 0x00000010), + /* GPP_C19 - GPIO */ + _PAD_CFG_STRUCT(GPP_C19, 0x44000100, 0x00000010), + /* GPP_C20 - RESERVED */ + /* GPP_C21 - GPIO */ + _PAD_CFG_STRUCT(GPP_C21, 0x44000100, 0x00000010), + /* GPP_C22 - GPIO */ + _PAD_CFG_STRUCT(GPP_C22, 0x80040102, 0x00000000), + /* GPP_C23 - GPIO */ + _PAD_CFG_STRUCT(GPP_C23, 0x40840102, 0x00000000), + + /* ------- GPIO Group GPP_D ------- */ + /* GPP_D0 - GPIO */ + _PAD_CFG_STRUCT(GPP_D0, 0x80840102, 0x00000000), + /* GPP_D1 - GPIO */ + _PAD_CFG_STRUCT(GPP_D1, 0x44000200, 0x00000010), + /* GPP_D2 - GPIO */ + _PAD_CFG_STRUCT(GPP_D2, 0x84000102, 0x00000010), + /* GPP_D3 - GPIO */ + _PAD_CFG_STRUCT(GPP_D3, 0x84000102, 0x00000010), + /* GPP_D4 - GPIO */ + _PAD_CFG_STRUCT(GPP_D4, 0x44000201, 0x00000010), + /* GPP_D5 - GPIO */ + _PAD_CFG_STRUCT(GPP_D5, 0x44000102, 0x00000010), + /* GPP_D6 - GPIO */ + _PAD_CFG_STRUCT(GPP_D6, 0x44000102, 0x00000010), + /* GPP_D7 - GPIO */ + _PAD_CFG_STRUCT(GPP_D7, 0x44000102, 0x00000010), + /* GPP_D8 - GPIO */ + _PAD_CFG_STRUCT(GPP_D8, 0x44000102, 0x00000010), + /* GPP_D9 - GPIO */ + _PAD_CFG_STRUCT(GPP_D9, 0x44000102, 0x00000010), + /* GPP_D10 - GPIO */ + _PAD_CFG_STRUCT(GPP_D10, 0x44000100, 0x00000010), + /* GPP_D11 - GPIO */ + _PAD_CFG_STRUCT(GPP_D11, 0x44000102, 0x00000010), + /* GPP_D12 - GPIO */ + _PAD_CFG_STRUCT(GPP_D12, 0x44000102, 0x00000010), + /* GPP_D13 - GPIO */ + _PAD_CFG_STRUCT(GPP_D13, 0x44000102, 0x00000010), + /* GPP_D14 - GPIO */ + _PAD_CFG_STRUCT(GPP_D14, 0x44000102, 0x00000010), + /* GPP_D15 - SSATA_SDATAOUT0 */ + _PAD_CFG_STRUCT(GPP_D15, 0x44000e00, 0x00000010), + /* GPP_D16 - GPIO */ + _PAD_CFG_STRUCT(GPP_D16, 0x44000102, 0x00000010), + /* GPP_D17 - GPIO */ + _PAD_CFG_STRUCT(GPP_D17, 0x44000102, 0x00000010), + /* GPP_D18 - GPIO */ + _PAD_CFG_STRUCT(GPP_D18, 0x44000102, 0x00000010), + /* GPP_D19 - GPIO */ + _PAD_CFG_STRUCT(GPP_D19, 0x44000201, 0x00000010), + /* GPP_D20 - GPIO */ + _PAD_CFG_STRUCT(GPP_D20, 0x44000102, 0x00000010), + /* GPP_D21 - GPIO */ + _PAD_CFG_STRUCT(GPP_D21, 0x44000102, 0x00000010), + /* GPP_D22 - GPIO */ + _PAD_CFG_STRUCT(GPP_D22, 0x44000102, 0x00000010), + /* GPP_D23 - GPIO */ + _PAD_CFG_STRUCT(GPP_D23, 0x44000102, 0x00000010), + + /* ------- GPIO Group GPP_E ------- */ + /* GPP_E0 - GPIO */ + _PAD_CFG_STRUCT(GPP_E0, 0x40040102, 0x00000010), + /* GPP_E1 - GPIO */ + _PAD_CFG_STRUCT(GPP_E1, 0x40040102, 0x00000010), + /* GPP_E2 - GPIO */ + _PAD_CFG_STRUCT(GPP_E2, 0x44000100, 0x00000010), + /* GPP_E3 - CPU_GP0 */ + _PAD_CFG_STRUCT(GPP_E3, 0x44000502, 0x00000010), + /* GPP_E4 - GPIO */ + _PAD_CFG_STRUCT(GPP_E4, 0x44000102, 0x00000010), + /* GPP_E5 - GPIO */ + _PAD_CFG_STRUCT(GPP_E5, 0x44000102, 0x00000010), + /* GPP_E6 - GPIO */ + _PAD_CFG_STRUCT(GPP_E6, 0x44000102, 0x00000010), + /* GPP_E7 - GPIO */ + _PAD_CFG_STRUCT(GPP_E7, 0x44000102, 0x00000010), + /* GPP_E8 - SATA_LED# */ + _PAD_CFG_STRUCT(GPP_E8, 0x44000600, 0x00000010), + /* GPP_E9 - USB_OC0# */ + _PAD_CFG_STRUCT(GPP_E9, 0x44000502, 0x00000010), + /* GPP_E10 - GPIO */ + _PAD_CFG_STRUCT(GPP_E10, 0x44000102, 0x00000010), + /* GPP_E11 - GPIO */ + _PAD_CFG_STRUCT(GPP_E11, 0x44000102, 0x00000010), + /* GPP_E12 - GPIO */ + _PAD_CFG_STRUCT(GPP_E12, 0x44000102, 0x00000010), + + /* ------- GPIO Community 2 ------- */ + /* -------- GPIO Group GPD -------- */ + /* GPD0 - RESERVED */ + /* GPD1 - GPIO */ + _PAD_CFG_STRUCT(GPD1, 0x04000102, 0x00000000), + /* GPD2 - GPIO */ + _PAD_CFG_STRUCT(GPD2, 0x04000102, 0x00000000), + /* GPD3 - PWRBTN# */ + _PAD_CFG_STRUCT(GPD3, 0x04000502, 0x00000000), + /* GPD4 - SLP_S3# */ + _PAD_CFG_STRUCT(GPD4, 0x04000600, 0x00000000), + /* GPD5 - SLP_S4# */ + _PAD_CFG_STRUCT(GPD5, 0x04000600, 0x00000000), + /* GPD6 - GPIO */ + _PAD_CFG_STRUCT(GPD6, 0x04000100, 0x00000000), + /* GPD7 - GPIO */ + _PAD_CFG_STRUCT(GPD7, 0x04000103, 0x00000000), + /* GPD8 - GPIO */ + _PAD_CFG_STRUCT(GPD8, 0x04000102, 0x00000000), + /* GPD9 - GPIO */ + _PAD_CFG_STRUCT(GPD9, 0x04000102, 0x00000000), + /* GPD10 - GPIO */ + _PAD_CFG_STRUCT(GPD10, 0x04000102, 0x00000000), + /* GPD11 - GBEPHY */ + _PAD_CFG_STRUCT(GPD11, 0x04000500, 0x00000000), + + /* ------- GPIO Community 3 ------- */ + /* ------- GPIO Group GPP_I ------- */ + /* GPP_I0 - LAN_TDO */ + _PAD_CFG_STRUCT(GPP_I0, 0x44000900, 0x00000010), + /* GPP_I1 - LAN_TCK */ + _PAD_CFG_STRUCT(GPP_I1, 0x44000a02, 0x00000010), + /* GPP_I2 - LAN_TMS */ + _PAD_CFG_STRUCT(GPP_I2, 0x44000a02, 0x00000010), + /* GPP_I3 - LAN_TDI */ + _PAD_CFG_STRUCT(GPP_I3, 0x44000a02, 0x00000010), + /* GPP_I4 - GPIO */ + _PAD_CFG_STRUCT(GPP_I4, 0x44000102, 0x00000010), + /* GPP_I5 - GPIO */ + _PAD_CFG_STRUCT(GPP_I5, 0x44000102, 0x00000010), + /* GPP_I6 - GPIO */ + _PAD_CFG_STRUCT(GPP_I6, 0x44000102, 0x00000010), + /* GPP_I7 - LAN_TRST_IN */ + _PAD_CFG_STRUCT(GPP_I7, 0x44000902, 0x00000010), + /* GPP_I8 - GPIO */ + _PAD_CFG_STRUCT(GPP_I8, 0x44000102, 0x00000010), + /* GPP_I9 - GPIO */ + _PAD_CFG_STRUCT(GPP_I9, 0x44000102, 0x00000010), + /* GPP_I10 - GPIO */ + _PAD_CFG_STRUCT(GPP_I10, 0x44000102, 0x00000010), + + /* ------- GPIO Community 4 ------- */ + /* ------- GPIO Group GPP_J ------- */ + /* GPP_J0 - LAN_LED_P0_0 */ + _PAD_CFG_STRUCT(GPP_J0, 0x44000600, 0x00000010), + /* GPP_J1 - LAN_LED_P0_1 */ + _PAD_CFG_STRUCT(GPP_J1, 0x44000600, 0x00000010), + /* GPP_J2 - LAN_LED_P1_0 */ + _PAD_CFG_STRUCT(GPP_J2, 0x44000600, 0x00000010), + /* GPP_J3 - LAN_LED_P1_1 */ + _PAD_CFG_STRUCT(GPP_J3, 0x44000600, 0x00000010), + /* GPP_J4 - LAN_LED_P2_0 */ + _PAD_CFG_STRUCT(GPP_J4, 0x44000600, 0x00000010), + /* GPP_J5 - LAN_LED_P2_1 */ + _PAD_CFG_STRUCT(GPP_J5, 0x44000600, 0x00000010), + /* GPP_J6 - LAN_LED_P3_0 */ + _PAD_CFG_STRUCT(GPP_J6, 0x44000600, 0x00000010), + /* GPP_J7 - LAN_LED_P3_1 */ + _PAD_CFG_STRUCT(GPP_J7, 0x44000600, 0x00000010), + /* GPP_J8 - LAN_I2C_SCL_MDC_P0 */ + _PAD_CFG_STRUCT(GPP_J8, 0x44000602, 0x00000010), + /* GPP_J9 - LAN_I2C_SDA_MDIO_P0 */ + _PAD_CFG_STRUCT(GPP_J9, 0x44000402, 0x00000010), + /* GPP_J10 - LAN_I2C_SCL_MDC_P1 */ + _PAD_CFG_STRUCT(GPP_J10, 0x44000602, 0x00000010), + /* GPP_J11 - LAN_I2C_SDA_MDIO_P1 */ + _PAD_CFG_STRUCT(GPP_J11, 0x44000402, 0x00000010), + /* GPP_J12 - LAN_I2C_SCL_MDC_P2 */ + _PAD_CFG_STRUCT(GPP_J12, 0x44000602, 0x00000010), + /* GPP_J13 - LAN_I2C_SDA_MDIO_P2 */ + _PAD_CFG_STRUCT(GPP_J13, 0x44000402, 0x00000010), + /* GPP_J14 - LAN_I2C_SCL_MDC_P3 */ + _PAD_CFG_STRUCT(GPP_J14, 0x44000602, 0x00000010), + /* GPP_J15 - LAN_I2C_SDA_MDIO_P3 */ + _PAD_CFG_STRUCT(GPP_J15, 0x44000402, 0x00000010), + /* GPP_J16 - LAN_SDP_P0_0 */ + _PAD_CFG_STRUCT(GPP_J16, 0x44000502, 0x00000010), + /* GPP_J17 - GPIO */ + _PAD_CFG_STRUCT(GPP_J17, 0x44000102, 0x00000010), + /* GPP_J18 - LAN_SDP_P1_0 */ + _PAD_CFG_STRUCT(GPP_J18, 0x44000502, 0x00000010), + /* GPP_J19 - GPIO */ + _PAD_CFG_STRUCT(GPP_J19, 0x44000102, 0x00000010), + /* GPP_J20 - LAN_SDP_P2_0 */ + _PAD_CFG_STRUCT(GPP_J20, 0x44000502, 0x00000010), + /* GPP_J21 - GPIO */ + _PAD_CFG_STRUCT(GPP_J21, 0x44000102, 0x00000010), + /* GPP_J22 - LAN_SDP_P3_0 */ + _PAD_CFG_STRUCT(GPP_J22, 0x44000502, 0x00000010), + /* GPP_J23 - GPIO */ + _PAD_CFG_STRUCT(GPP_J23, 0x44000102, 0x00000010), + + /* ------- GPIO Group GPP_K ------- */ + /* GPP_K0 - GPIO */ + _PAD_CFG_STRUCT(GPP_K0, 0x44000100, 0x00000010), + /* GPP_K1 - GPIO */ + _PAD_CFG_STRUCT(GPP_K1, 0x44000100, 0x00000010), + /* GPP_K2 - GPIO */ + _PAD_CFG_STRUCT(GPP_K2, 0x44000100, 0x00000010), + /* GPP_K3 - GPIO */ + _PAD_CFG_STRUCT(GPP_K3, 0x44000100, 0x00000010), + /* GPP_K4 - GPIO */ + _PAD_CFG_STRUCT(GPP_K4, 0x44000100, 0x00000010), + /* GPP_K5 - GPIO */ + _PAD_CFG_STRUCT(GPP_K5, 0x44000102, 0x00000010), + /* GPP_K6 - GPIO */ + _PAD_CFG_STRUCT(GPP_K6, 0x44000102, 0x00000010), + /* GPP_K7 - RESERVED */ + _PAD_CFG_STRUCT(GPP_K7, 0x44000600, 0x00000010), + /* GPP_K8 - LAN_NCSI_ARB_IN */ + _PAD_CFG_STRUCT(GPP_K8, 0x44000502, 0x00000010), + /* GPP_K9 - LAN_NCSI_ARB_OUT */ + _PAD_CFG_STRUCT(GPP_K9, 0x44000602, 0x00000010), + /* GPP_K10 - PE_RST# */ + _PAD_CFG_STRUCT(GPP_K10, 0x44000502, 0x00000010), + + /* ------- GPIO Community 5 ------- */ + /* ------- GPIO Group GPP_G ------- */ + /* GPP_G0 - GPIO */ + _PAD_CFG_STRUCT(GPP_G0, 0x44000102, 0x00000010), + /* GPP_G1 - GPIO */ + _PAD_CFG_STRUCT(GPP_G1, 0x44000102, 0x00000010), + /* GPP_G2 - GPIO */ + _PAD_CFG_STRUCT(GPP_G2, 0x44000102, 0x00000010), + /* GPP_G3 - GPIO */ + _PAD_CFG_STRUCT(GPP_G3, 0x44000102, 0x00000010), + /* GPP_G4 - GPIO */ + _PAD_CFG_STRUCT(GPP_G4, 0x44000102, 0x00000010), + /* GPP_G5 - GPIO */ + _PAD_CFG_STRUCT(GPP_G5, 0x44000102, 0x00000010), + /* GPP_G6 - GPIO */ + _PAD_CFG_STRUCT(GPP_G6, 0x44000102, 0x00000010), + /* GPP_G7 - GPIO */ + _PAD_CFG_STRUCT(GPP_G7, 0x44000102, 0x00000010), + /* GPP_G8 - GPIO */ + _PAD_CFG_STRUCT(GPP_G8, 0x44000102, 0x00000010), + /* GPP_G9 - GPIO */ + _PAD_CFG_STRUCT(GPP_G9, 0x44000102, 0x00000010), + /* GPP_G10 - GPIO */ + _PAD_CFG_STRUCT(GPP_G10, 0x44000102, 0x00000010), + /* GPP_G11 - GPIO */ + _PAD_CFG_STRUCT(GPP_G11, 0x44000102, 0x00000010), + /* GPP_G12 - GPIO */ + _PAD_CFG_STRUCT(GPP_G12, 0x44000103, 0x00000010), + /* GPP_G13 - GPIO */ + _PAD_CFG_STRUCT(GPP_G13, 0x44000103, 0x00000010), + /* GPP_G14 - GPIO */ + _PAD_CFG_STRUCT(GPP_G14, 0x44000101, 0x00000010), + /* GPP_G15 - GPIO */ + _PAD_CFG_STRUCT(GPP_G15, 0x44000101, 0x00000010), + /* GPP_G16 - GPIO */ + _PAD_CFG_STRUCT(GPP_G16, 0x44000101, 0x00000010), + /* GPP_G17 - ADR_COMPLETE */ + _PAD_CFG_STRUCT(GPP_G17, 0x44000600, 0x00000010), + /* GPP_G18 - NMI# */ + _PAD_CFG_STRUCT(GPP_G18, 0x44000600, 0x00000010), + /* GPP_G19 - SMI# */ + _PAD_CFG_STRUCT(GPP_G19, 0x44000600, 0x00000010), + /* GPP_G20 - RESERVED */ + /* GPP_G21 - GPIO */ + _PAD_CFG_STRUCT(GPP_G21, 0x44000100, 0x00000010), + /* GPP_G22 - GPIO */ + _PAD_CFG_STRUCT(GPP_G22, 0x44000201, 0x00000010), + /* GPP_G23 - GPIO */ + _PAD_CFG_STRUCT(GPP_G23, 0x44000102, 0x00000010), + + /* ------- GPIO Group GPP_H ------- */ + /* GPP_H0 - GPIO */ + _PAD_CFG_STRUCT(GPP_H0, 0x44000102, 0x00000010), + /* GPP_H1 - GPIO */ + _PAD_CFG_STRUCT(GPP_H1, 0x44000102, 0x00000010), + /* GPP_H2 - GPIO */ + _PAD_CFG_STRUCT(GPP_H2, 0x44000102, 0x00000010), + /* GPP_H3 - GPIO */ + _PAD_CFG_STRUCT(GPP_H3, 0x44000102, 0x00000010), + /* GPP_H4 - GPIO */ + _PAD_CFG_STRUCT(GPP_H4, 0x44000102, 0x00000010), + /* GPP_H5 - RESERVED */ + /* GPP_H6 - GPIO */ + _PAD_CFG_STRUCT(GPP_H6, 0x44000102, 0x00000010), + /* GPP_H7 - GPIO */ + _PAD_CFG_STRUCT(GPP_H7, 0x44000102, 0x00000010), + /* GPP_H8 - GPIO */ + _PAD_CFG_STRUCT(GPP_H8, 0x44000102, 0x00000010), + /* GPP_H9 - GPIO */ + _PAD_CFG_STRUCT(GPP_H9, 0x44000102, 0x00000010), + /* GPP_H10 - RESERVED */ + /* GPP_H11 - RESERVED */ + /* GPP_H12 - GPIO */ + _PAD_CFG_STRUCT(GPP_H12, 0x44000102, 0x00000010), + /* GPP_H13 - RESERVED */ + /* GPP_H14 - RESERVED */ + /* GPP_H15 - GPIO */ + _PAD_CFG_STRUCT(GPP_H15, 0x84000102, 0x00000010), + /* GPP_H16 - RESERVED */ + /* GPP_H17 - RESERVED */ + /* GPP_H18 - GPIO */ + _PAD_CFG_STRUCT(GPP_H18, 0x44000100, 0x00000010), + /* GPP_H19 - GPIO */ + _PAD_CFG_STRUCT(GPP_H19, 0x84000102, 0x00000010), + /* GPP_H20 - GPIO */ + _PAD_CFG_STRUCT(GPP_H20, 0x44000102, 0x00000010), + /* GPP_H21 - GPIO */ + _PAD_CFG_STRUCT(GPP_H21, 0x44000102, 0x00000010), + /* GPP_H22 - GPIO */ + _PAD_CFG_STRUCT(GPP_H22, 0x44000102, 0x00000010), + /* GPP_H23 - GPIO */ + _PAD_CFG_STRUCT(GPP_H23, 0x44000102, 0x00000010), + + /* ------- GPIO Group GPP_L ------- */ + /* GPP_L0 - RESERVED */ + /* GPP_L1 - CSME_INTR_OUT */ + _PAD_CFG_STRUCT(GPP_L1, 0x44000700, 0x00000000), + /* GPP_L2 - GPIO */ + _PAD_CFG_STRUCT(GPP_L2, 0x44000100, 0x00000010), + /* GPP_L3 - GPIO */ + _PAD_CFG_STRUCT(GPP_L3, 0x44000100, 0x00000010), + /* GPP_L4 - GPIO */ + _PAD_CFG_STRUCT(GPP_L4, 0x44000100, 0x00000010), + /* GPP_L5 - GPIO */ + _PAD_CFG_STRUCT(GPP_L5, 0x44000100, 0x00000010), + /* GPP_L6 - GPIO */ + _PAD_CFG_STRUCT(GPP_L6, 0x44000102, 0x00000010), + /* GPP_L7 - GPIO */ + _PAD_CFG_STRUCT(GPP_L7, 0x44000102, 0x00000010), + /* GPP_L8 - GPIO */ + _PAD_CFG_STRUCT(GPP_L8, 0x44000102, 0x00000010), + /* GPP_L9 - GPIO */ + _PAD_CFG_STRUCT(GPP_L9, 0x44000102, 0x00000010), + /* GPP_L10 - GPIO */ + _PAD_CFG_STRUCT(GPP_L10, 0x44000100, 0x00000010), + /* GPP_L11 - GPIO */ + _PAD_CFG_STRUCT(GPP_L11, 0x44000100, 0x00000010), + /* GPP_L12 - GPIO */ + _PAD_CFG_STRUCT(GPP_L12, 0x44000100, 0x00000010), + /* GPP_L13 - GPIO */ + _PAD_CFG_STRUCT(GPP_L13, 0x44000100, 0x00000010), + /* GPP_L14 - GPIO */ + _PAD_CFG_STRUCT(GPP_L14, 0x44000100, 0x00000010), + /* GPP_L15 - GPIO */ + _PAD_CFG_STRUCT(GPP_L15, 0x44000100, 0x00000010), + /* GPP_L16 - GPIO */ + _PAD_CFG_STRUCT(GPP_L16, 0x44000100, 0x00000010), + /* GPP_L17 - GPIO */ + _PAD_CFG_STRUCT(GPP_L17, 0x44000100, 0x00000010), + /* GPP_L18 - GPIO */ + _PAD_CFG_STRUCT(GPP_L18, 0x44000100, 0x00000010), + /* GPP_L19 - GPIO */ + _PAD_CFG_STRUCT(GPP_L19, 0x44000100, 0x00000010), +}; + +#endif /* CFG_PCH_GPIO_H */ diff --git a/src/mainboard/ocp/tiogapass/romstage.c b/src/mainboard/ocp/tiogapass/romstage.c index e4a188d35d..41f785638a 100644 --- a/src/mainboard/ocp/tiogapass/romstage.c +++ b/src/mainboard/ocp/tiogapass/romstage.c @@ -20,7 +20,6 @@ #include #include -#include "skxsp_tp_gpio.h" #include "skxsp_tp_iio.h" static uint8_t iio_table_buf[sizeof(tp_iio_bifur_table)]; @@ -39,16 +38,6 @@ static void oem_update_iio(FSPM_UPD *mupd) = IIO_BIFURCATE_xxx8xxx8; } -/* -* Configure GPIO depend on platform -*/ -static void mainboard_config_gpios(FSPM_UPD *mupd) -{ - mupd->FspmConfig.GpioConfig.GpioTable = (UPD_GPIO_INIT_CONFIG *) tp_gpio_table; - mupd->FspmConfig.GpioConfig.NumberOfEntries = - sizeof(tp_gpio_table)/sizeof(UPD_GPIO_INIT_CONFIG); -} - static void mainboard_config_iio(FSPM_UPD *mupd) { memcpy(iio_table_buf, tp_iio_bifur_table, sizeof(tp_iio_bifur_table)); @@ -74,6 +63,9 @@ static void mainboard_config_iio(FSPM_UPD *mupd) void mainboard_memory_init_params(FSPM_UPD *mupd) { - mainboard_config_gpios(mupd); mainboard_config_iio(mupd); + + /* do not configure GPIO controller inside FSP-M */ + mupd->FspmConfig.GpioConfig.GpioTable = NULL; + mupd->FspmConfig.GpioConfig.NumberOfEntries = 0; } -- cgit v1.2.3