From 6bb199d258401c13ee56b850c94700bbfa639c3a Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Sat, 26 Jul 2025 20:51:07 +0530 Subject: [PATCH] mb/google/fatcat/var/fatcat: Move `ISH_GP_x` pads to fw_config.c The ISH GPIO pads for `ISH_GP_x` (GPP_B04, GPP_B05, GPP_B07, GPP_B08, GPP_B22, GPP_B23) were previously configured in the generic gpio_table. This commit moves their configuration to the `ish_enable_pads` and `ish_disable_pads` structures within `fw_config.c`. This change ensures that these ISH-specific pads are only configured when the ISH is enabled, aligning with best practices for power management and reducing potential conflicts when ISH is not in use. BUG=b:396557201 TEST=Able to build and boot google/fatcat w/ ISH enable and/or disable. Change-Id: I4ef896d220fbe5f9c042c4d9df97d32ac238cbc5 Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/coreboot/+/88570 Tested-by: build bot (Jenkins) Reviewed-by: Kapil Porwal Reviewed-by: Pranava Y N --- .../google/fatcat/variants/fatcat/fw_config.c | 24 +++++++++++++++++++ .../google/fatcat/variants/fatcat/gpio.c | 12 ---------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/mainboard/google/fatcat/variants/fatcat/fw_config.c b/src/mainboard/google/fatcat/variants/fatcat/fw_config.c index 75a7a06007..e10dfbb389 100644 --- a/src/mainboard/google/fatcat/variants/fatcat/fw_config.c +++ b/src/mainboard/google/fatcat/variants/fatcat/fw_config.c @@ -488,6 +488,18 @@ static const struct pad_config thc1_enable_wake[] = { }; static const struct pad_config ish_disable_pads[] = { + /* GPP_B04: NC */ + PAD_NC(GPP_B04, NONE), + /* GPP_B05: NC */ + PAD_NC(GPP_B05, NONE), + /* GPP_B07: NC */ + PAD_NC(GPP_B07, NONE), + /* GPP_B08: NC */ + PAD_NC(GPP_B08, NONE), + /* GPP_B22: NC */ + PAD_NC(GPP_B22, NONE), + /* GPP_B23: NC */ + PAD_NC(GPP_B23, NONE), /* GPP_D06: NC */ PAD_NC(GPP_D06, NONE), /* GPP_E05: NC */ @@ -497,6 +509,18 @@ static const struct pad_config ish_disable_pads[] = { }; static const struct pad_config ish_enable_pads[] = { + /* GPP_B04: ISH_GP_0_SNSR_HDR */ + PAD_CFG_NF(GPP_B04, NONE, DEEP, NF4), + /* GPP_B05: ISH_GP_1_SNSR_HDR */ + PAD_CFG_NF(GPP_B05, NONE, DEEP, NF4), + /* GPP_B07: ISH_GP_3_SNSR_HDR */ + PAD_CFG_NF(GPP_B07, NONE, DEEP, NF4), + /* GPP_B08: ISH_GP_4_SNSR_HDR */ + PAD_CFG_NF(GPP_B08, NONE, DEEP, NF4), + /* GPP_B22: ISH_GP_5_SNSR_HDR */ + PAD_CFG_NF(GPP_B22, NONE, DEEP, NF4), + /* GPP_B23: ISH_GP_6_SNSR_HDR */ + PAD_CFG_NF(GPP_B23, NONE, DEEP, NF4), /* GPP_D06: ISH_UART0_TXD */ PAD_CFG_NF(GPP_D06, NONE, DEEP, NF2), /* GPP_E05: ISH_GP_7_SNSR_HDR */ diff --git a/src/mainboard/google/fatcat/variants/fatcat/gpio.c b/src/mainboard/google/fatcat/variants/fatcat/gpio.c index f9a1ba2c74..62fc5aed49 100644 --- a/src/mainboard/google/fatcat/variants/fatcat/gpio.c +++ b/src/mainboard/google/fatcat/variants/fatcat/gpio.c @@ -53,14 +53,6 @@ static const struct pad_config gpio_table[] = { /* GPP_B03: ISH_I2C0_SCL_SNSR_HDR */ /* NOTE: IOSSTAGE: 'Ignore' for S0ix */ PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_B03, NONE, DEEP, NF3), - /* GPP_B04: ISH_GP_0_SNSR_HDR */ - PAD_CFG_NF(GPP_B04, NONE, DEEP, NF4), - /* GPP_B05: ISH_GP_1_SNSR_HDR */ - PAD_CFG_NF(GPP_B05, NONE, DEEP, NF4), - /* GPP_B07: ISH_GP_3_SNSR_HDR */ - PAD_CFG_NF(GPP_B07, NONE, DEEP, NF4), - /* GPP_B08: ISH_GP_4_SNSR_HDR */ - PAD_CFG_NF(GPP_B08, NONE, DEEP, NF4), /* GPP_B09: M2_GEN4_SSD_RESET_N */ PAD_CFG_GPO(GPP_B09, 1, PLTRST), /* GPP_B10: GEN4_SSD_PWREN */ @@ -89,10 +81,6 @@ static const struct pad_config gpio_table[] = { PAD_CFG_GPO(GPP_B20, 1, PLTRST), /* GPP_B21: TCP_RETIMER_FORCE_PWR */ PAD_CFG_GPO(GPP_B21, 0, DEEP), - /* GPP_B22: ISH_GP_5_SNSR_HDR */ - PAD_CFG_NF(GPP_B22, NONE, DEEP, NF4), - /* GPP_B23: ISH_GP_6_SNSR_HDR */ - PAD_CFG_NF(GPP_B23, NONE, DEEP, NF4), /* GPP_B24: ESPI_ALERT0_EC_R_N */ PAD_NC(GPP_B24, NONE),