Change in coreboot[master]: soc/amd/common/block/include/gpio_defs: drop 8k pullup define

[Felix Held (Code Review)]

Attention is currently required from: Jason Glenesk, Raul Rangel, Marshall Dawson.
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/59591 )

Change subject: soc/amd/common/block/include/gpio_defs: drop 8k pullup define
......................................................................

soc/amd/common/block/include/gpio_defs: drop 8k pullup define

The corresponding bit is marked as reserved in all SoCs using this code
so drop the define. Also change the definition of GPIO_PULL_MASK to only
cover the bits used for the feature.

Signed-off-by: Felix Held 
Change-Id: Iaf2d4eec7a13e558c75d7edea343b876909a5b33
---
M src/soc/amd/common/block/include/amdblocks/gpio_defs.h
1 file changed, 2 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/59591/1

diff --git a/src/soc/amd/common/block/include/amdblocks/gpio_defs.h b/src/soc/amd/common/block/include/amdblocks/gpio_defs.h
index 757e0f2..793e717 100644
--- a/src/soc/amd/common/block/include/amdblocks/gpio_defs.h
+++ b/src/soc/amd/common/block/include/amdblocks/gpio_defs.h
@@ -52,10 +52,10 @@
 #define GPIO_S4_S5_WAKE_EN	(1 << 15)

#define GPIO_PIN_STS		(1 << 16)
-#define GPIO_8KPULLUP_SELECT	(1 << 19)
+
 #define GPIO_PULLUP_ENABLE	(1 << 20)
 #define GPIO_PULLDOWN_ENABLE	(1 << 21)
-#define GPIO_PULL_MASK		(7 << 19)
+#define GPIO_PULL_MASK		(3 << 20)

#define GPIO_INPUT_SHIFT	16
 #define GPIO_INPUT_VALUE	(1 << GPIO_INPUT_SHIFT)
@@ -72,7 +72,6 @@
 #define GPIO_OUTPUT_OUT_HIGH (GPIO_OUTPUT_ENABLE | GPIO_OUTPUT_VALUE)
 #define GPIO_OUTPUT_OUT_LOW GPIO_OUTPUT_ENABLE

-#define GPIO_PULL_PULL_UP_8K (GPIO_PULLUP_ENABLE | GPIO_8KPULLUP_SELECT)
 #define GPIO_PULL_PULL_UP GPIO_PULLUP_ENABLE
 #define GPIO_PULL_PULL_DOWN GPIO_PULLDOWN_ENABLE
 #define GPIO_PULL_PULL_NONE 0