mb/google/brya: Lock FPMCU pins in brask and brya baseboards

This applies a configuration lock to the FPMCU SPI and IRQ GPIOs
for all brya and brask variants.

BUG=b:208827718
TEST=cat /sys/kernel/debug/pinctrl/INTC1055\:00/pins suggests `FPMCU_*`
(F11-F13 and F15-F16) are locked.

Signed-off-by: Subrata Banik <subratabanik@google.com>
Change-Id: I1d0b8a5aed6ea54bcfaa267cae5ca78595396ce5
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61502
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>
This commit is contained in:
Subrata Banik 2022-01-31 17:53:17 +05:30
parent a0dd454115
commit fedc5427fd
2 changed files with 5 additions and 10 deletions

View File

@ -230,17 +230,17 @@ static const struct pad_config gpio_table[] = {
/* F10 : GPPF10_STRAP */ /* F10 : GPPF10_STRAP */
PAD_NC(GPP_F10, DN_20K), PAD_NC(GPP_F10, DN_20K),
/* F11 : THC1_SPI2_CLK ==> GSPI_PCH_CLK_FPMCU_R */ /* F11 : THC1_SPI2_CLK ==> GSPI_PCH_CLK_FPMCU_R */
PAD_CFG_NF(GPP_F11, NONE, DEEP, NF4), PAD_CFG_NF_LOCK(GPP_F11, NONE, NF4, LOCK_CONFIG),
/* F12 : GSXDOUT ==> GSPI_PCH_DO_FPMCU_DI_R */ /* F12 : GSXDOUT ==> GSPI_PCH_DO_FPMCU_DI_R */
PAD_CFG_NF(GPP_F12, NONE, DEEP, NF4), PAD_CFG_NF_LOCK(GPP_F12, NONE, NF4, LOCK_CONFIG),
/* F13 : GSXDOUT ==> GSPI_PCH_DI_FPMCU_DO */ /* F13 : GSXDOUT ==> GSPI_PCH_DI_FPMCU_DO */
PAD_CFG_NF(GPP_F13, NONE, DEEP, NF4), PAD_CFG_NF_LOCK(GPP_F13, NONE, NF4, LOCK_CONFIG),
/* F14 : GSXDIN ==> EN_PP3300_SSD */ /* F14 : GSXDIN ==> EN_PP3300_SSD */
PAD_CFG_GPO(GPP_F14, 1, DEEP), PAD_CFG_GPO(GPP_F14, 1, DEEP),
/* F15 : GSXSRESET# ==> FPMCU_INT_L */ /* F15 : GSXSRESET# ==> FPMCU_INT_L */
PAD_CFG_GPI_IRQ_WAKE(GPP_F15, NONE, DEEP, LEVEL, INVERT), PAD_CFG_GPI_IRQ_WAKE_LOCK(GPP_F15, NONE, LEVEL, INVERT, LOCK_CONFIG),
/* F16 : GSXCLK ==> GSPI_PCH_CS_FPMCU_R_L */ /* F16 : GSXCLK ==> GSPI_PCH_CS_FPMCU_R_L */
PAD_CFG_NF(GPP_F16, NONE, DEEP, NF4), PAD_CFG_NF_LOCK(GPP_F16, NONE, NF4, LOCK_CONFIG),
/* F17 : THC1_SPI2_RST# ==> EC_PCH_INT_ODL */ /* F17 : THC1_SPI2_RST# ==> EC_PCH_INT_ODL */
PAD_CFG_GPI_IRQ_WAKE(GPP_F17, NONE, DEEP, LEVEL, INVERT), PAD_CFG_GPI_IRQ_WAKE(GPP_F17, NONE, DEEP, LEVEL, INVERT),
/* F18 : THC1_SPI2_INT# ==> EC_IN_RW_OD */ /* F18 : THC1_SPI2_INT# ==> EC_IN_RW_OD */

View File

@ -458,11 +458,6 @@ const struct pad_config *__weak variant_romstage_gpio_table(size_t *num)
} }
static struct gpio_lock_config lockable_brya_gpios[] = { static struct gpio_lock_config lockable_brya_gpios[] = {
{ GPP_F11, GPIO_LOCK_CONFIG }, /* GSPI_PCH_CLK_FPMCU_R */
{ GPP_F13, GPIO_LOCK_CONFIG }, /* GSPI_PCH_D1_FPMCU_D0 */
{ GPP_F12, GPIO_LOCK_CONFIG }, /* GSPI_PCH_D0_FPMCU_D1_R */
{ GPP_F15, GPIO_LOCK_CONFIG }, /* FPMCU_INT_L */
{ GPP_F16, GPIO_LOCK_CONFIG }, /* GSPI_PCH_CS_FPMCU_R_L */
}; };
const struct gpio_lock_config *mb_gpio_lock_config(size_t *num) const struct gpio_lock_config *mb_gpio_lock_config(size_t *num)