mb/googlz/zork: Drop unnecessary PULL_UPs in variant overrides

This change drops the pulls configured on override GPIOs as they
already have external pull-ups. Also, pads which are unused are
configured as PAD_NC.

BUG=b:154351731

Change-Id: I8da5d51af25bbe2694c21ecb0868c9cc387243cb
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43562
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>

5 files changed, 19 insertions, 19 deletions

diff --git a/src/mainboard/google/zork/variants/berknip/gpio.c b/src/mainboard/google/zork/variants/berknip/gpio.c
index 2a50d74b8bd4..51a640b24400 100644
--- a/src/mainboard/google/zork/variants/berknip/gpio.c
+++ b/src/mainboard/google/zork/variants/berknip/gpio.c
@@ -11,9 +11,9 @@ static const struct soc_amd_gpio berknip_bid1_gpio_set_stage_ram[] = {
 	/* DMIC_SEL */
 	PAD_GPO(GPIO_13, LOW), // Select Camera 1 Dmic
 	/* USB_OC4_L - USB_A1 */
-	PAD_NF(GPIO_14, USB_OC4_L, PULL_UP),
+	PAD_NF(GPIO_14, USB_OC4_L, PULL_NONE),
 	/* USB_OC2_L - USB A0 */
-	PAD_NF(GPIO_18, USB_OC2_L, PULL_UP),
+	PAD_NF(GPIO_18, USB_OC2_L, PULL_NONE),
 	/* EN_PWR_TOUCHPAD_PS2 */
 	PAD_GPO(GPIO_67, HIGH),
 	/* MST_GPIO_2 (Fw Update HDMI hub) */
diff --git a/src/mainboard/google/zork/variants/dalboz/gpio.c b/src/mainboard/google/zork/variants/dalboz/gpio.c
index a4813e90fba9..73c0042f0b37 100644
--- a/src/mainboard/google/zork/variants/dalboz/gpio.c
+++ b/src/mainboard/google/zork/variants/dalboz/gpio.c
@@ -12,11 +12,11 @@ static const struct soc_amd_gpio bid_1_gpio_set_stage_ram[] = {
 	/* DMIC_SEL */
 	PAD_GPO(GPIO_6, LOW), // Select Camera 1 DMIC
 	/* USB_OC2_L - USB A0 & A1 */
-	PAD_NF(GPIO_18, USB_OC2_L, PULL_UP),
+	PAD_NF(GPIO_18, USB_OC2_L, PULL_NONE),
 	/* EN_PWR_TOUCHPAD_PS2 */
 	PAD_GPO(GPIO_67, HIGH),
 	/* Unused */
-	PAD_GPI(GPIO_143, PULL_DOWN),
+	PAD_NC(GPIO_143),
 };
 
 static const struct soc_amd_gpio bid_2_gpio_set_stage_ram[] = {
diff --git a/src/mainboard/google/zork/variants/ezkinil/gpio.c b/src/mainboard/google/zork/variants/ezkinil/gpio.c
index d8c8edd1c05c..ece5a0ebfa5d 100644
--- a/src/mainboard/google/zork/variants/ezkinil/gpio.c
+++ b/src/mainboard/google/zork/variants/ezkinil/gpio.c
@@ -11,9 +11,9 @@ static const struct soc_amd_gpio ezkinil_bid1_gpio_set_stage_ram[] = {
 	/* DMIC_SEL */
 	PAD_GPO(GPIO_13, LOW), // Select Camera 1 Dmic
 	/* USB_OC4_L - USB_A1 */
-	PAD_NF(GPIO_14, USB_OC4_L, PULL_UP),
+	PAD_NF(GPIO_14, USB_OC4_L, PULL_NONE),
 	/* USB_OC2_L - USB A0 */
-	PAD_NF(GPIO_18, USB_OC2_L, PULL_UP),
+	PAD_NF(GPIO_18, USB_OC2_L, PULL_NONE),
 	/* EN_PWR_TOUCHPAD_PS2 */
 	PAD_GPO(GPIO_67, HIGH),
 	/* MST_GPIO_2 (Fw Update HDMI hub) */
@@ -24,22 +24,22 @@ static const struct soc_amd_gpio ezkinil_bid1_gpio_set_stage_ram[] = {
 
 static const struct soc_amd_gpio ezkinil_bid2_gpio_set_stage_ram[] = {
 	/* FPMCU_RST_L Change NC */
-	PAD_GPI(GPIO_11, PULL_UP),
+	PAD_NC(GPIO_11),
 	/* DMIC_SEL */
 	PAD_GPO(GPIO_13, LOW), // Select Camera 1 Dmic
 	/* EN_PWR_TOUCHPAD_PS2 */
 	PAD_GPO(GPIO_67, HIGH),
 	/* FPMCU_BOOT0 Change NC */
-	PAD_GPI(GPIO_69, PULL_UP),
+	PAD_NC(GPIO_69),
 	/* MST_GPIO_2 (Fw Update HDMI hub) Change NC */
-	PAD_GPI(GPIO_86, PULL_UP),
+	PAD_NC(GPIO_86),
 };
 
 static const struct soc_amd_gpio ezkinil_bid3_gpio_set_stage_ram[] = {
 	/* FPMCU_RST_L Change NC */
-	PAD_GPI(GPIO_11, PULL_UP),
+	PAD_NC(GPIO_11),
 	/* FPMCU_BOOT0 Change NC */
-	PAD_GPI(GPIO_69, PULL_UP),
+	PAD_NC(GPIO_69),
 };
 
 const struct soc_amd_gpio *variant_override_gpio_table(size_t *size)
diff --git a/src/mainboard/google/zork/variants/morphius/gpio.c b/src/mainboard/google/zork/variants/morphius/gpio.c
index 4cb98a3481e4..7ff7088687ae 100644
--- a/src/mainboard/google/zork/variants/morphius/gpio.c
+++ b/src/mainboard/google/zork/variants/morphius/gpio.c
@@ -11,9 +11,9 @@ static const struct soc_amd_gpio morphius_bid1_gpio_set_stage_ram[] = {
 	/* DMIC_SEL */
 	PAD_GPO(GPIO_13, LOW), // Select Camera 1 Dmic
 	/* USB_OC4_L - USB_A1 */
-	PAD_NF(GPIO_14, USB_OC4_L, PULL_UP),
+	PAD_NF(GPIO_14, USB_OC4_L, PULL_NONE),
 	/* USB_OC2_L - USB A0 */
-	PAD_NF(GPIO_18, USB_OC2_L, PULL_UP),
+	PAD_NF(GPIO_18, USB_OC2_L, PULL_NONE),
 	/* EN_PWR_TOUCHPAD_PS2 */
 	PAD_GPO(GPIO_67, HIGH),
 	/* DMIC_AD_EN */
@@ -28,9 +28,9 @@ static const struct soc_amd_gpio morphius_bid2_gpio_set_stage_ram[] = {
 	/* DMIC_SEL */
 	PAD_GPO(GPIO_13, LOW), // Select Camera 1 Dmic
 	/* USB_OC4_L - USB_A1 */
-	PAD_NF(GPIO_14, USB_OC4_L, PULL_UP),
+	PAD_NF(GPIO_14, USB_OC4_L, PULL_NONE),
 	/* USB_OC2_L - USB A0 */
-	PAD_NF(GPIO_18, USB_OC2_L, PULL_UP),
+	PAD_NF(GPIO_18, USB_OC2_L, PULL_NONE),
 	/* EN_PWR_TOUCHPAD_PS2 */
 	PAD_GPO(GPIO_67, HIGH),
 	/* MST_GPIO_2 (Fw Update HDMI hub) */
diff --git a/src/mainboard/google/zork/variants/trembyle/gpio.c b/src/mainboard/google/zork/variants/trembyle/gpio.c
index ce7e5dd5c61e..6f7c4a2b2dd8 100644
--- a/src/mainboard/google/zork/variants/trembyle/gpio.c
+++ b/src/mainboard/google/zork/variants/trembyle/gpio.c
@@ -11,9 +11,9 @@ static const struct soc_amd_gpio trembyle_bid1_bid2_gpio_set_stage_ram[] = {
 	/* DMIC_SEL */
 	PAD_GPO(GPIO_13, LOW), // Select Camera 1 Dmic
 	/* USB_OC4_L - USB_A1 */
-	PAD_NF(GPIO_14, USB_OC4_L, PULL_UP),
+	PAD_NF(GPIO_14, USB_OC4_L, PULL_NONE),
 	/* USB_OC2_L - USB A0 */
-	PAD_NF(GPIO_18, USB_OC2_L, PULL_UP),
+	PAD_NF(GPIO_18, USB_OC2_L, PULL_NONE),
 	/* EN_PWR_TOUCHPAD_PS2 */
 	PAD_GPO(GPIO_67, HIGH),
 	/* DMIC_AD_EN */
@@ -28,9 +28,9 @@ static const struct soc_amd_gpio trembyle_bid3_gpio_set_stage_ram[] = {
 	/* DMIC_SEL */
 	PAD_GPO(GPIO_13, LOW), // Select Camera 1 Dmic
 	/* USB_OC4_L - USB_A1 */
-	PAD_NF(GPIO_14, USB_OC4_L, PULL_UP),
+	PAD_NF(GPIO_14, USB_OC4_L, PULL_NONE),
 	/* USB_OC2_L - USB A0 */
-	PAD_NF(GPIO_18, USB_OC2_L, PULL_UP),
+	PAD_NF(GPIO_18, USB_OC2_L, PULL_NONE),
 	/* EN_PWR_TOUCHPAD_PS2 */
 	PAD_GPO(GPIO_67, HIGH),
 	/* MST_GPIO_2 (Fw Update HDMI hub) */