soc/intel,mb/*: get rid of legacy pad macros

Get rid of legacy pad macros by replacing them with their newer
equivalents.

TEST: TIMELESS-built board images match

Change-Id: I078f9bb3c78f642afc6dcfd64d77be823a4485c2
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46567
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>

1 files changed, 51 insertions, 51 deletions

diff --git a/src/mainboard/51nb/x210/gpio.h b/src/mainboard/51nb/x210/gpio.h
index 34ee409e00..53a7547f31 100644
--- a/src/mainboard/51nb/x210/gpio.h
+++ b/src/mainboard/51nb/x210/gpio.h
@@ -30,14 +30,14 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_A5, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_A6, NONE, DEEP, NF1),
 	PAD_CFG_GPO(GPP_A7, 1, DEEP),
-	PAD_NC(GPP_A8, 20K_PU),
-	PAD_CFG_NF(GPP_A9, 20K_PD, DEEP, NF1),
-	PAD_CFG_NF(GPP_A10, 20K_PD, DEEP, NF1),
+	PAD_NC(GPP_A8, UP_20K),
+	PAD_CFG_NF(GPP_A9, DN_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_A10, DN_20K, DEEP, NF1),
 	PAD_CFG_GPO(GPP_A11, 0, DEEP),
 	PAD_CFG_GPO(GPP_A12, 0, PWROK),
 	PAD_CFG_NF(GPP_A13, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_A14, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_A15, 20K_PU, DEEP, NF1),
+	PAD_CFG_NF(GPP_A15, UP_20K, DEEP, NF1),
 	PAD_CFG_NF(GPP_A16, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_A17, NONE, DEEP, NF1),
 	PAD_NC(GPP_A18, NONE),
@@ -45,7 +45,7 @@ static const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_A20, NONE),
 	PAD_NC(GPP_A21, NONE),
 	PAD_CFG_GPO(GPP_A22, 1, DEEP),
-	PAD_CFG_GPI_TRIG_OWN(GPP_A23, 20K_PD, DEEP, OFF, ACPI),
+	PAD_CFG_GPI_TRIG_OWN(GPP_A23, DN_20K, DEEP, OFF, ACPI),
 	PAD_CFG_NF(GPP_B0, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_B1, NONE, DEEP, NF1),
 	PAD_NC(GPP_B2, NONE),
@@ -60,25 +60,25 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_B11, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_B12, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),
-	PAD_CFG_TERM_GPO(GPP_B14, 1, 20K_PD, DEEP),
+	PAD_CFG_TERM_GPO(GPP_B14, 1, DN_20K, DEEP),
 	PAD_NC(GPP_B15, NONE),
 	PAD_CFG_GPI_TRIG_OWN(GPP_B16, NONE, PLTRST, OFF, ACPI),
-	PAD_CFG_GPI_TRIG_OWN(GPP_B17, 20K_PU, PLTRST, OFF, ACPI),
-	PAD_CFG_GPI_TRIG_OWN(GPP_B18, 20K_PU, PLTRST, OFF, ACPI),
+	PAD_CFG_GPI_TRIG_OWN(GPP_B17, UP_20K, PLTRST, OFF, ACPI),
+	PAD_CFG_GPI_TRIG_OWN(GPP_B18, UP_20K, PLTRST, OFF, ACPI),
 	PAD_NC(GPP_B19, NONE),
-	PAD_CFG_NF(GPP_B20, 20K_PD, DEEP, NF1),
-	PAD_CFG_NF(GPP_B21, 20K_PD, DEEP, NF1),
-	PAD_CFG_NF(GPP_B22, 20K_PD, DEEP, NF1),
-	PAD_CFG_TERM_GPO(GPP_B23, 1, 20K_PD, DEEP),
+	PAD_CFG_NF(GPP_B20, DN_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_B21, DN_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_B22, DN_20K, DEEP, NF1),
+	PAD_CFG_TERM_GPO(GPP_B23, 1, DN_20K, DEEP),
 	PAD_CFG_NF(GPP_C0, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_C1, 20K_PD, DEEP, NF1),
-	PAD_CFG_TERM_GPO(GPP_C2, 1, 20K_PD, DEEP),
-	PAD_CFG_NF(GPP_C3, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF(GPP_C4, 20K_PU, DEEP, NF1),
-	PAD_CFG_GPI_TRIG_OWN(GPP_C5, 20K_PD, DEEP, OFF, ACPI),
+	PAD_CFG_NF(GPP_C1, DN_20K, DEEP, NF1),
+	PAD_CFG_TERM_GPO(GPP_C2, 1, DN_20K, DEEP),
+	PAD_CFG_NF(GPP_C3, UP_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_C4, UP_20K, DEEP, NF1),
+	PAD_CFG_GPI_TRIG_OWN(GPP_C5, DN_20K, DEEP, OFF, ACPI),
 	/* GPP_C6 - RESERVED */
 	/* GPP_C7 - RESERVED */
-	PAD_CFG_NF(GPP_C8, 20K_PU, DEEP, NF1),
+	PAD_CFG_NF(GPP_C8, UP_20K, DEEP, NF1),
 	PAD_CFG_NF(GPP_C9, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_C10, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_C11, NONE, DEEP, NF1),
@@ -86,11 +86,11 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_C13, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_C14, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_C15, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_C16, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF(GPP_C17, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF(GPP_C18, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF(GPP_C19, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF(GPP_C20, 20K_PU, DEEP, NF1),
+	PAD_CFG_NF(GPP_C16, UP_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_C17, UP_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_C18, UP_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_C19, UP_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_C20, UP_20K, DEEP, NF1),
 	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_C22, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_C23, NONE, DEEP, NF1),
@@ -99,22 +99,22 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_D2, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_D3, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_D4, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_D5, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF(GPP_D6, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF(GPP_D7, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF(GPP_D8, 20K_PU, DEEP, NF1),
-	PAD_CFG_GPI_TRIG_OWN(GPP_D9, 20K_PU, DEEP, OFF, ACPI),
-	PAD_CFG_GPI_TRIG_OWN(GPP_D10, 20K_PU, DEEP, OFF, ACPI),
-	PAD_CFG_GPI_TRIG_OWN(GPP_D11, 20K_PU, DEEP, OFF, ACPI),
-	PAD_CFG_GPI_TRIG_OWN(GPP_D12, 20K_PU, DEEP, OFF, ACPI),
-	PAD_CFG_NF(GPP_D13, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF(GPP_D14, 20K_PU, DEEP, NF1),
+	PAD_CFG_NF(GPP_D5, UP_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_D6, UP_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_D7, UP_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_D8, UP_20K, DEEP, NF1),
+	PAD_CFG_GPI_TRIG_OWN(GPP_D9, UP_20K, DEEP, OFF, ACPI),
+	PAD_CFG_GPI_TRIG_OWN(GPP_D10, UP_20K, DEEP, OFF, ACPI),
+	PAD_CFG_GPI_TRIG_OWN(GPP_D11, UP_20K, DEEP, OFF, ACPI),
+	PAD_CFG_GPI_TRIG_OWN(GPP_D12, UP_20K, DEEP, OFF, ACPI),
+	PAD_CFG_NF(GPP_D13, UP_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_D14, UP_20K, DEEP, NF1),
 	PAD_CFG_NF(GPP_D15, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_D16, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_D17, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_D18, 20K_PD, DEEP, NF1),
+	PAD_CFG_NF(GPP_D18, DN_20K, DEEP, NF1),
 	PAD_CFG_NF(GPP_D19, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_D20, 20K_PD, DEEP, NF1),
+	PAD_CFG_NF(GPP_D20, DN_20K, DEEP, NF1),
 	PAD_CFG_NF(GPP_D21, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_D22, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_D23, NONE, DEEP, NF1),
@@ -136,16 +136,16 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_GPI_SCI(GPP_E15, NONE, PLTRST, LEVEL, INVERT),
 	PAD_CFG_GPI_TRIG_OWN(GPP_E16, NONE, PLTRST, OFF, ACPI),
 	PAD_CFG_NF(GPP_E17, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_E18, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF(GPP_E19, 20K_PD, DEEP, NF1),
-	PAD_CFG_NF(GPP_E20, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF(GPP_E21, 20K_PD, DEEP, NF1),
+	PAD_CFG_NF(GPP_E18, UP_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_E19, DN_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_E20, UP_20K, DEEP, NF1),
+	PAD_CFG_NF(GPP_E21, DN_20K, DEEP, NF1),
 	PAD_CFG_GPIO_BIDIRECT(GPP_E22, 0, NONE, DEEP, OFF, ACPI),
-	PAD_CFG_TERM_GPO(GPP_E23, 1, 20K_PD, DEEP),
-	PAD_CFG_NF(GPD0, 20K_PU, PWROK, NF1),
+	PAD_CFG_TERM_GPO(GPP_E23, 1, DN_20K, DEEP),
+	PAD_CFG_NF(GPD0, UP_20K, PWROK, NF1),
 	PAD_CFG_NF(GPD1, NONE, PWROK, NF1),
 	PAD_CFG_NF(GPD2, NATIVE, PWROK, NF1),
-	PAD_CFG_NF(GPD3, 20K_PU, PWROK, NF1),
+	PAD_CFG_NF(GPD3, UP_20K, PWROK, NF1),
 	PAD_CFG_NF(GPD4, NONE, PWROK, NF1),
 	PAD_CFG_NF(GPD5, NONE, PWROK, NF1),
 	PAD_CFG_NF(GPD6, NONE, PWROK, NF1),
@@ -158,14 +158,14 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_F1, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_F2, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_F3, NONE, DEEP, NF1),
-	PAD_CFG_NF_1V8(GPP_F4, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF_1V8(GPP_F5, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF_1V8(GPP_F6, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF_1V8(GPP_F7, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF_1V8(GPP_F8, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF_1V8(GPP_F9, 20K_PU, DEEP, NF1),
-	PAD_CFG_NF_1V8(GPP_F10, 20K_PU, DEEP, NF2),
-	PAD_CFG_NF_1V8(GPP_F11, 20K_PU, DEEP, NF2),
+	PAD_CFG_NF_1V8(GPP_F4, UP_20K, DEEP, NF1),
+	PAD_CFG_NF_1V8(GPP_F5, UP_20K, DEEP, NF1),
+	PAD_CFG_NF_1V8(GPP_F6, UP_20K, DEEP, NF1),
+	PAD_CFG_NF_1V8(GPP_F7, UP_20K, DEEP, NF1),
+	PAD_CFG_NF_1V8(GPP_F8, UP_20K, DEEP, NF1),
+	PAD_CFG_NF_1V8(GPP_F9, UP_20K, DEEP, NF1),
+	PAD_CFG_NF_1V8(GPP_F10, UP_20K, DEEP, NF2),
+	PAD_CFG_NF_1V8(GPP_F11, UP_20K, DEEP, NF2),
 	PAD_CFG_NF(GPP_F12, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_F13, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_F14, NONE, DEEP, NF1),
@@ -185,7 +185,7 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_G4, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_G5, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_G6, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_G7, 20K_PD, DEEP, NF1),
+	PAD_CFG_NF(GPP_G7, DN_20K, DEEP, NF1),
 };
 
 #endif