mb/siemens/mc_ehl2: Adjust GPIOs
Set the GPIOs according to the circuit diagram for this mainboard.
Change-Id: I19dc24a16ee9f533b45879bf60fb441e24018cc8
Signed-off-by: Mario Scheithauer <mario.scheithauer@siemens.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58168
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/gpio.c b/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/gpio.c
index 91c0417..b83fabc1 100644
--- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/gpio.c
+++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/gpio.c
@@ -3,12 +3,13 @@
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
-/* Pad configuration in ramstage*/
+/* Pad configuration in ramstage */
static const struct pad_config gpio_table[] = {
+
/* Community 0 - GpioGroup GPP_B */
PAD_CFG_NF(GPP_B2, NONE, PLTRST, NF1), /* PMC_VRALERT_N */
PAD_CFG_NF(GPP_B3, NONE, PLTRST, NF4), /* ESPI_ALERT0_N */
- PAD_CFG_NF(GPP_B4, NONE, PLTRST, NF4), /* ESPI_ALERT1_N */
+ PAD_NC(GPP_B4, NONE), /* Not connected */
PAD_NC(GPP_B9, NONE), /* Not connected */
PAD_NC(GPP_B10, NONE), /* Not connected */
PAD_CFG_NF(GPP_B11, NONE, PLTRST, NF1), /* PMC_ALERT_N */
@@ -16,14 +17,11 @@
PAD_CFG_NF(GPP_B15, NONE, PLTRST, NF5), /* ESPI_CS1_N */
PAD_NC(GPP_B18, NONE), /* Not connected */
PAD_NC(GPP_B19, NONE), /* Not connected */
- PAD_NC(GPP_B20, NONE), /* Not connected */
- PAD_NC(GPP_B21, NONE), /* Not connected */
- PAD_NC(GPP_B22, NONE), /* Not connected */
PAD_NC(GPP_B23, NONE), /* Not connected */
/* Community 0 - GpioGroup GPP_T */
- PAD_CFG_NF(GPP_T4, UP_20K, DEEP, NF1), /* PSE_GBE0_INT */
- PAD_CFG_NF(GPP_T5, DN_20K, DEEP, NF1), /* PSE_GBE0_RST_N */
+ PAD_CFG_NF(GPP_T4, NONE, DEEP, NF1), /* PSE_GBE0_INT */
+ PAD_CFG_GPO(GPP_T5, 1, DEEP), /* PSE_GBE0_RST_N */
PAD_CFG_NF(GPP_T6, NONE, DEEP, NF1), /* PSE_GBE0_AUXTS */
PAD_CFG_NF(GPP_T7, NONE, DEEP, NF1), /* PSE_GBE0_PPS */
PAD_CFG_NF(GPP_T12, NONE, DEEP, NF2), /* SIO_UART0_RXD */
@@ -32,15 +30,7 @@
/* Community 0 - GpioGroup GPP_G */
PAD_NC(GPP_G8, NONE), /* Not connected */
PAD_NC(GPP_G9, NONE), /* Not connected */
- PAD_NC(GPP_G12, NONE), /* Not connected */
- PAD_CFG_NF(GPP_G15, NONE, DEEP, NF1), /* ESPI_IO_0 */
- PAD_CFG_NF(GPP_G16, NONE, DEEP, NF1), /* ESPI_IO_1 */
- PAD_CFG_NF(GPP_G17, NONE, DEEP, NF1), /* ESPI_IO_2 */
- PAD_CFG_NF(GPP_G18, NONE, DEEP, NF1), /* ESPI_IO_3 */
PAD_CFG_GPI(GPP_G19, UP_20K, PLTRST), /* TPM_IRQ_N */
- PAD_CFG_NF(GPP_G20, NONE, DEEP, NF1), /* ESPI_CSO_N */
- PAD_CFG_NF(GPP_G21, NONE, DEEP, NF1), /* ESPI_CLK */
- PAD_CFG_NF(GPP_G22, NONE, DEEP, NF1), /* ESPI_RST0_N */
/* Community 1 - GpioGroup GPP_V */
PAD_CFG_NF(GPP_V0, UP_20K, DEEP, NF1), /* EMMC_CMD */
@@ -54,36 +44,36 @@
PAD_CFG_NF(GPP_V8, UP_20K, DEEP, NF1), /* EMMC_DATA7 */
PAD_CFG_NF(GPP_V9, DN_20K, DEEP, NF1), /* EMMC_RCLK */
PAD_CFG_NF(GPP_V10, DN_20K, DEEP, NF1), /* EMMC_CLK */
- PAD_CFG_NF(GPP_V11, NONE, DEEP, NF1), /* EMMC_RESET_N */
+ PAD_CFG_NF(GPP_V11, NONE, DEEP, NF1), /* EMMC_RESET */
/* Community 1 - GpioGroup GPP_H */
- PAD_CFG_NF(GPP_H0, DN_20K, DEEP, NF1), /* PSE_GBE1_INT */
- PAD_CFG_NF(GPP_H1, DN_20K, DEEP, NF1), /* PSE_GBE1_RST_N */
+ PAD_CFG_NF(GPP_H0, NONE, DEEP, NF1), /* PSE_GBE1_INT */
+ PAD_CFG_GPO(GPP_H1, 1, DEEP), /* PSE_GBE1_RST_N */
PAD_CFG_NF(GPP_H2, NONE, DEEP, NF1), /* PSE_GBE1_AUXTS */
PAD_CFG_NF(GPP_H3, NONE, DEEP, NF1), /* PSE_GBE1_PPS */
- PAD_CFG_NF(GPP_H8, UP_20K, DEEP, NF1), /* SIO_I2C4_SDA */
- PAD_CFG_NF(GPP_H9, UP_20K, DEEP, NF1), /* SIO_I2C4_SCL */
+ PAD_CFG_NF(GPP_H10, NONE, DEEP, NF1), /* PCIE_CLKREQ4_N */
+ PAD_CFG_NF(GPP_H11, NONE, DEEP, NF1), /* PCIE_CLKREQ5_N */
/* Community 1 - GpioGroup GPP_D */
- PAD_CFG_GPO(GPP_D16, 0, DEEP), /* EMMC_PWR_EN_N */
+ PAD_CFG_NF(GPP_D5, NONE, DEEP, NF1), /* PCIE_CLKREQ0_N */
+ PAD_CFG_NF(GPP_D6, NONE, DEEP, NF1), /* PCIE_CLKREQ1_N */
+ PAD_CFG_NF(GPP_D7, NONE, DEEP, NF1), /* PCIE_CLKREQ2_N */
+ PAD_CFG_NF(GPP_D8, NONE, DEEP, NF1), /* PCIE_CLKREQ3_N */
/* Community 1 - GpioGroup GPP_U */
- PAD_CFG_NF(GPP_U0, DN_20K, DEEP, NF1), /* GBE_INT */
- PAD_CFG_NF(GPP_U1, DN_20K, DEEP, NF1), /* GBE_RST_N */
- PAD_CFG_NF(GPP_U2, NONE, DEEP, NF1), /* GBE_PPS */
- PAD_CFG_NF(GPP_U3, NONE, DEEP, NF1), /* GBE_AUXTS */
+ PAD_CFG_NF(GPP_U0, NONE, DEEP, NF1), /* GBE_INT */
+ PAD_CFG_GPO(GPP_U1, 1, DEEP), /* GBE_RST_N */
PAD_NC(GPP_U12, NONE), /* Not connected */
PAD_NC(GPP_U13, NONE), /* Not connected */
PAD_NC(GPP_U16, NONE), /* Not connected */
PAD_NC(GPP_U17, NONE), /* Not connected */
PAD_NC(GPP_U18, NONE), /* Not connected */
- PAD_CFG_GPO(GPP_U19, 1, DEEP), /* UPD_REQ_N */
/* Community 2 - GpioGroup DSW */
- PAD_CFG_NF(GPD4, NONE, PLTRST, NF1), /* SLP_S3 */
- PAD_CFG_NF(GPD5, NONE, PLTRST, NF1), /* SLP_S4 */
- PAD_NC(GPD7, NONE), /* Not connected */
- PAD_CFG_NF(GPD10, NONE, PLTRST, NF1), /* SLP_S5 */
+ PAD_CFG_NF(GPD1, NONE, PLTRST, NF1), /* ACPRESENT */
+ PAD_NC(GPD9, NONE), /* Not connected */
+ /* ONBOARD_X4_PCIE_SLOT1_RESET_N */
+ PAD_CFG_GPO(GPD11, 1, PLTRST),
/* Community 3 - GpioGroup GPP_S */
PAD_NC(GPP_S0, NONE), /* Not connected */
@@ -101,32 +91,34 @@
PAD_CFG_NF(GPP_A8, NONE, DEEP, NF1), /* PSE_GBE0_RGMII_RXD2 */
PAD_CFG_NF(GPP_A9, NONE, DEEP, NF1), /* PSE_GBE0_RGMII_RXD1 */
PAD_CFG_NF(GPP_A10, NONE, DEEP, NF1), /* PSE_GBE0_RGMII_RXD0 */
+ PAD_CFG_NF(GPP_A11, NONE, DEEP, NF1), /* PSE_GBE1_RGMII_TXD3 */
+ PAD_CFG_NF(GPP_A12, NONE, DEEP, NF1), /* PSE_GBE1_RGMII_TXD2 */
+ PAD_CFG_NF(GPP_A13, NONE, DEEP, NF1), /* PSE_GBE1_RGMII_TXD1 */
+ PAD_CFG_NF(GPP_A14, NONE, DEEP, NF1), /* PSE_GBE1_RGMII_TXD0 */
+ PAD_CFG_NF(GPP_A15, NONE, DEEP, NF1), /* PSE_GBE1_RGMII_TXCLK */
+ PAD_CFG_NF(GPP_A16, NONE, DEEP, NF1), /* PSE_GBE1_RGMII_TXCTL */
+ PAD_CFG_NF(GPP_A17, NONE, DEEP, NF1), /* PSE_GBE1_RGMII_RXCLK */
+ PAD_CFG_NF(GPP_A18, NONE, DEEP, NF1), /* PSE_GBE1_RGMII_RXCTL */
+ PAD_CFG_NF(GPP_A19, NONE, DEEP, NF1), /* PSE_GBE1_RGMII_RXD3 */
+ PAD_CFG_NF(GPP_A20, NONE, DEEP, NF1), /* PSE_GBE1_RGMII_RXD2 */
+ PAD_CFG_NF(GPP_A21, NONE, DEEP, NF1), /* PSE_GBE1_RGMII_RXD1 */
+ PAD_CFG_NF(GPP_A22, NONE, DEEP, NF1), /* PSE_GBE1_RGMII_RXD0 */
PAD_CFG_NF(GPP_A23, NONE, DEEP, NF1), /* PSE_GBE0_RGMII_RXCTL */
/* Community 4 - GpioGroup GPP_C */
PAD_CFG_NF(GPP_C3, NONE, DEEP, NF1), /* PSE_GBE0_MDC */
PAD_CFG_NF(GPP_C4, NONE, DEEP, NF1), /* PSE_GBE0_MDIO */
- PAD_NC(GPP_C5, NONE), /* Not connected */
PAD_CFG_NF(GPP_C6, NONE, DEEP, NF1), /* PSE_GBE0_AUXTS */
PAD_CFG_NF(GPP_C7, NONE, DEEP, NF1), /* PSE_GBE0_PPS */
- PAD_NC(GPP_C8, NONE), /* Not connected */
PAD_CFG_NF(GPP_C12, NONE, DEEP, NF4), /* SIO_UART1_RXD */
PAD_CFG_NF(GPP_C13, NONE, DEEP, NF4), /* SIO_UART1_TXD */
PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1), /* GBE_MDIO */
PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1), /* GBE_MDC */
- PAD_CFG_NF(GPP_C18, NONE, DEEP, NF4), /* SIO_I2C1_SDA */
- PAD_CFG_NF(GPP_C19, NONE, DEEP, NF4), /* SIO_I2C1_SCL */
/* Community 4 - GpioGroup GPP_F */
- PAD_NC(GPP_F0, NONE), /* Not connected */
PAD_NC(GPP_F1, NONE), /* Not connected */
- PAD_NC(GPP_F2, NONE), /* Not connected */
PAD_NC(GPP_F3, NONE), /* Not connected */
- PAD_NC(GPP_F4, NONE), /* Not connected */
- PAD_NC(GPP_F5, NONE), /* Not connected */
- PAD_NC(GPP_F7, NONE), /* Not connected */
PAD_NC(GPP_F8, NONE), /* Not connected */
- PAD_NC(GPP_F10, NONE), /* Not connected */
PAD_NC(GPP_F11, NONE), /* Not connected */
PAD_NC(GPP_F12, NONE), /* Not connected */
PAD_NC(GPP_F13, NONE), /* Not connected */
@@ -134,35 +126,24 @@
PAD_NC(GPP_F15, NONE), /* Not connected */
PAD_NC(GPP_F16, NONE), /* Not connected */
PAD_NC(GPP_F17, NONE), /* Not connected */
- PAD_NC(GPP_F20, NONE), /* Not connected */
- PAD_NC(GPP_F21, NONE), /* Not connected */
+ PAD_CFG_GPO(GPP_F20, 0, DEEP), /* LED_BIOS_DONE */
/* Community 4 - GpioGroup GPP_E */
PAD_CFG_NF(GPP_E0, NONE, DEEP, NF1), /* SATA_LED_N */
- PAD_CFG_NF(GPP_E3, NONE, DEEP, NF1), /* DDI1_HPD */
- PAD_CFG_NF(GPP_E5, NONE, DEEP, NF1), /* DDI1_DDC_SDA */
- PAD_NC(GPP_E6, NONE), /* Not connected */
- PAD_CFG_NF(GPP_E7, NONE, DEEP, NF1), /* DDI1_DDC_SCL */
- PAD_CFG_NF(GPP_E14, NONE, DEEP, NF1), /* DDI0_HPD */
+ PAD_CFG_NF(GPP_E8, NONE, DEEP, NF2), /* M.2_SSD_SATA_DEVSLP_1 */
PAD_NC(GPP_E15, NONE), /* Not connected */
PAD_NC(GPP_E16, NONE), /* Not connected */
- PAD_CFG_NF(GPP_E18, NONE, DEEP, NF1), /* DDI0_DDC_SDA */
+ PAD_NC(GPP_E18, NONE), /* Not connected */
PAD_CFG_NF(GPP_E19, NONE, DEEP, NF1), /* DDI0_DDC_SCL */
PAD_NC(GPP_E23, NONE), /* Not connected */
/* Community 5 - GpioGroup GPP_R */
PAD_NC(GPP_R1, NONE), /* Not connected */
- PAD_NC(GPP_R2, NONE), /* Not connected */
PAD_NC(GPP_R3, NONE), /* Not connected */
};
/* Early pad configuration in bootblock */
static const struct pad_config early_gpio_table[] = {
- PAD_CFG_NF(GPP_C0, NONE, DEEP, NF1), /* SMB_CLK */
- PAD_CFG_NF(GPP_C1, NONE, DEEP, NF1), /* SMB_DATA */
- PAD_CFG_NF(GPP_C2, NONE, DEEP, NF2), /* SMB_ALERT_N */
- PAD_CFG_NF(GPP_C20, NONE, DEEP, NF4), /* SIO_UART2_RXD */
- PAD_CFG_NF(GPP_C21, NONE, DEEP, NF4), /* SIO_UART2_TXD */
};
const struct pad_config *variant_gpio_table(size_t *num)