commit e2f30b4e56fe87cc3354b18d1aa8b75c387365b4
author Felix Held <felix-coreboot@felixheld.de> Tue Nov 23 10:19:28 2021 +0100
committer Felix Held <felix-coreboot@felixheld.de> Thu Nov 25 11:07:36 2021 +0000
tree 3ca2aaee02a3bdc1d04ae68760fa7cbf7b0f3500
parent 61ac5087121cf84af0195f0b678b964a7693c8df

soc/amd/common/block/include/gpio_defs: use bit definitions for masks

All bits covered by the bit masks GPIO_INT_ENABLE_MASK, GPIO_PULL_MASK,
GPIO_STATUS_MASK and GPIO_WAKE_MASK already have definitions in the code
so use those instead of magic numbers.

TEST=Timeless build results in identical image for amd/mandolin.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I0bc9e1cecf2f063b42de3f8875fee421dd256648
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59593
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>

src/soc/amd/common/block/include/amdblocks/gpio_defs.h

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 7ca1c00..3d97250 100644
--- a/src/soc/amd/common/block/include/amdblocks/gpio_defs.h
+++ b/src/soc/amd/common/block/include/amdblocks/gpio_defs.h
@@ -44,7 +44,7 @@
 #define GPIO_INT_ENABLE_STATUS		(1 << 11)
 #define GPIO_INT_ENABLE_DELIVERY	(1 << 12)
 #define GPIO_INT_ENABLE_STATUS_DELIVERY	(GPIO_INT_ENABLE_STATUS | GPIO_INT_ENABLE_DELIVERY)
-#define GPIO_INT_ENABLE_MASK		(3 << 11)
+#define GPIO_INT_ENABLE_MASK		(GPIO_INT_ENABLE_STATUS | GPIO_INT_ENABLE_DELIVERY)
 
 #define GPIO_S0I3_WAKE_EN	(1 << 13)
 #define GPIO_S3_WAKE_EN		(1 << 14)
@@ -54,7 +54,7 @@
 
 #define GPIO_PULLUP_ENABLE	(1 << 20)
 #define GPIO_PULLDOWN_ENABLE	(1 << 21)
-#define GPIO_PULL_MASK		(3 << 20)
+#define GPIO_PULL_MASK		(GPIO_PULLUP_ENABLE | GPIO_PULLDOWN_ENABLE)
 
 #define GPIO_INPUT_SHIFT	16
 #define GPIO_INPUT_VALUE	(1 << GPIO_INPUT_SHIFT)
@@ -66,7 +66,7 @@
 
 #define GPIO_INT_STATUS		(1 << 28)
 #define GPIO_WAKE_STATUS	(1 << 29)
-#define GPIO_STATUS_MASK	(3 << 28)
+#define GPIO_STATUS_MASK	(GPIO_INT_STATUS | GPIO_WAKE_STATUS)
 
 #define GPIO_OUTPUT_OUT_HIGH (GPIO_OUTPUT_ENABLE | GPIO_OUTPUT_VALUE)
 #define GPIO_OUTPUT_OUT_LOW GPIO_OUTPUT_ENABLE
@@ -136,7 +136,7 @@
 #define GPIO_WAKE_S0i3_S3		(GPIO_WAKE_S0i3 | GPIO_WAKE_S3)
 #define GPIO_WAKE_S0i3_S4_S5		(GPIO_WAKE_S0i3 | GPIO_WAKE_S4_S5)
 #define GPIO_WAKE_S3_S4_S5		(GPIO_WAKE_S3 | GPIO_WAKE_S4_S5)
-#define GPIO_WAKE_MASK			(7 << 13)
+#define GPIO_WAKE_MASK			(GPIO_WAKE_S0i3 | GPIO_WAKE_S3 | GPIO_WAKE_S4_S5)
 
 /*
  * Mask used to reset bits in GPIO control register when configuring pad using `program_gpios()`