From 0805a7e66a50ff07a48dec2400e8c8296f42c53f Mon Sep 17 00:00:00 2001 From: Hannah Williams Date: Tue, 29 Aug 2017 16:46:35 -0700 Subject: [PATCH] soc/intel/common/block/gpio: Fix PAD_DW1_MASK for case CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_PADCFG_PADTOL=y https://ticket.coreboot.org/issues/128 Signed-off-by: Hannah Williams Change-Id: I2b0b9c07ebc99f4b4d7e8c5a72483bedd33e2e07 Reviewed-on: https://review.coreboot.org/21282 Tested-by: build bot (Jenkins) Reviewed-by: Youness Alaoui Reviewed-by: Aaron Durbin --- src/soc/intel/common/block/gpio/gpio.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/soc/intel/common/block/gpio/gpio.c b/src/soc/intel/common/block/gpio/gpio.c index f77f88f3e0..6b6395544e 100644 --- a/src/soc/intel/common/block/gpio/gpio.c +++ b/src/soc/intel/common/block/gpio/gpio.c @@ -36,9 +36,16 @@ PAD_CFG0_TRIG_MASK | PAD_CFG0_RXRAW1_MASK | \ PAD_CFG0_RXPADSTSEL_MASK | PAD_CFG0_RESET_MASK) +#if IS_ENABLED(CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_PADCFG_PADTOL) +#define PAD_DW1_MASK (PAD_CFG1_IOSTERM_MASK | \ + PAD_CFG1_PULL_MASK | \ + PAD_CFG1_TOL_MASK | \ + PAD_CFG1_IOSSTATE_MASK) +#else #define PAD_DW1_MASK (PAD_CFG1_IOSTERM_MASK | \ PAD_CFG1_PULL_MASK | \ PAD_CFG1_IOSSTATE_MASK) +#endif #define PAD_DW2_MASK (0) #define PAD_DW3_MASK (0)