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, 31 insertions, 31 deletions

diff --git a/src/mainboard/kontron/bsl6/gpio.h b/src/mainboard/kontron/bsl6/gpio.h
index a76c9679b9..d6e976ee10 100644
--- a/src/mainboard/kontron/bsl6/gpio.h
+++ b/src/mainboard/kontron/bsl6/gpio.h
@@ -11,21 +11,21 @@
 /* Pad configuration in ramstage. */
 static const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_A0, NONE, PLTRST, NF1),
-	PAD_CFG_NF(GPP_A1, 20K_PU, PLTRST, NF1),
-	PAD_CFG_NF(GPP_A2, 20K_PU, PLTRST, NF1),
-	PAD_CFG_NF(GPP_A3, 20K_PU, PLTRST, NF1),
-	PAD_CFG_NF(GPP_A4, 20K_PU, PLTRST, NF1),
+	PAD_CFG_NF(GPP_A1, UP_20K, PLTRST, NF1),
+	PAD_CFG_NF(GPP_A2, UP_20K, PLTRST, NF1),
+	PAD_CFG_NF(GPP_A3, UP_20K, PLTRST, NF1),
+	PAD_CFG_NF(GPP_A4, UP_20K, PLTRST, NF1),
 	PAD_CFG_NF(GPP_A5, NONE, PLTRST, NF1),
 	PAD_CFG_NF(GPP_A6, NONE, PLTRST, NF1),
 	PAD_CFG_GPI_INT(GPP_A7, NONE, PLTRST, OFF),
 	PAD_CFG_NF(GPP_A8, NONE, PLTRST, NF1),
-	PAD_CFG_NF(GPP_A9, 20K_PD, PLTRST, NF1),
-	PAD_CFG_NF(GPP_A10, 20K_PD, PLTRST, NF1),
+	PAD_CFG_NF(GPP_A9, DN_20K, PLTRST, NF1),
+	PAD_CFG_NF(GPP_A10, DN_20K, PLTRST, NF1),
 	PAD_CFG_GPI_INT(GPP_A11, NONE, PLTRST, OFF),
 	PAD_CFG_GPO(GPP_A12, 1, PLTRST),
 	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_GPI_INT(GPP_A16, NONE, PLTRST, OFF),
 	PAD_CFG_GPI_INT(GPP_A17, NONE, PLTRST, OFF),
 	PAD_CFG_GPI_INT(GPP_A18, NONE, PLTRST, OFF),
@@ -49,7 +49,7 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_GPI_INT(GPP_B11, NONE, PLTRST, OFF),
 	PAD_CFG_NF(GPP_B12, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),
-	PAD_CFG_NF(GPP_B14, 20K_PD, PLTRST, NF1),
+	PAD_CFG_NF(GPP_B14, DN_20K, PLTRST, NF1),
 	PAD_CFG_GPI_INT(GPP_B15, NONE, PLTRST, OFF),
 	PAD_CFG_GPI_INT(GPP_B16, NONE, PLTRST, OFF),
 	PAD_CFG_GPO(GPP_B17, 1, DEEP),
@@ -58,11 +58,11 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_GPI_INT(GPP_B20, NONE, PLTRST, OFF),
 	PAD_CFG_GPI_INT(GPP_B21, NONE, PLTRST, OFF),
 	PAD_CFG_GPI_INT(GPP_B22, NONE, PLTRST, OFF),
-	PAD_CFG_TERM_GPO(GPP_B23, 1, 20K_PU, DEEP),
+	PAD_CFG_TERM_GPO(GPP_B23, 1, UP_20K, DEEP),
 
 	PAD_CFG_NF(GPP_C0, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_C1, NONE, DEEP, NF1),
-	PAD_CFG_GPI_ACPI_SCI(GPP_C2, NONE, DEEP, YES),
+	PAD_CFG_GPI_SCI(GPP_C2, NONE, DEEP, EDGE_SINGLE, INVERT),
 	PAD_CFG_NF(GPP_C3, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_C4, NONE, DEEP, NF1),
 	PAD_CFG_GPI_INT(GPP_C5, NONE, PLTRST, OFF),
@@ -110,14 +110,14 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_GPO(GPP_D22, 0, DEEP),
 	PAD_CFG_GPI_INT(GPP_D23, NONE, PLTRST, OFF),
 
-	PAD_CFG_NF(GPP_E0, 20K_PU, PLTRST, NF1),
-	PAD_CFG_NF(GPP_E1, 20K_PU, PLTRST, NF1),
+	PAD_CFG_NF(GPP_E0, UP_20K, PLTRST, NF1),
+	PAD_CFG_NF(GPP_E1, UP_20K, PLTRST, NF1),
 	PAD_CFG_GPI_INT(GPP_E2, NONE, PLTRST, OFF),
 	PAD_CFG_GPI_SCI_HIGH(GPP_E3, NONE, DEEP, LEVEL),
 	PAD_CFG_NF(GPP_E4, NONE, PWROK, NF1),
 	PAD_CFG_GPI_INT(GPP_E5, NONE, PLTRST, OFF),
 	PAD_CFG_GPI_INT(GPP_E6, NONE, PLTRST, OFF),
-	PAD_CFG_GPI_ACPI_SCI(GPP_E7, NONE, DEEP, YES),
+	PAD_CFG_GPI_SCI(GPP_E7, NONE, DEEP, EDGE_SINGLE, INVERT),
 	PAD_CFG_NF(GPP_E8, NONE, PLTRST, NF1),
 	PAD_CFG_NF(GPP_E9, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_E10, NONE, DEEP, NF1),
@@ -125,20 +125,20 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_E12, NONE, DEEP, NF1),
 
 	PAD_CFG_GPI_INT(GPP_F0, NONE, PLTRST, OFF),
-	PAD_CFG_NF(GPP_F1, 20K_PU, PLTRST, NF1),
+	PAD_CFG_NF(GPP_F1, UP_20K, PLTRST, NF1),
 	PAD_CFG_NF(GPP_F2, NONE, PLTRST, NF1),
 	PAD_CFG_NF(GPP_F3, NONE, PLTRST, NF1),
 	PAD_CFG_NF(GPP_F4, NONE, PLTRST, NF1),
-	PAD_CFG_GPI_ACPI_SCI(GPP_F5, NONE, DEEP, NONE),
+	PAD_CFG_GPI_SCI(GPP_F5, NONE, DEEP, EDGE_SINGLE, NONE),
 	PAD_CFG_NF(GPP_F6, NONE, PWROK, NF1),
 	PAD_CFG_GPI_INT(GPP_F7, NONE, PLTRST, OFF),
 	PAD_CFG_GPI_INT(GPP_F8, NONE, PLTRST, OFF),
 	PAD_CFG_GPI_INT(GPP_F9, NONE, PLTRST, OFF),
-	PAD_CFG_GPI_APIC(GPP_F10, NONE, PLTRST),
+	PAD_CFG_GPI_APIC_HIGH(GPP_F10, NONE, PLTRST),
 	PAD_CFG_GPI_INT(GPP_F11, NONE, PLTRST, OFF),
-	PAD_CFG_GPI_APIC_INVERT(GPP_F12, NONE, PLTRST),
-	PAD_CFG_GPI_APIC(GPP_F13, NONE, PLTRST),
-	PAD_CFG_GPI_APIC_INVERT(GPP_F14, NONE, DEEP),
+	PAD_CFG_GPI_APIC_LOW(GPP_F12, NONE, PLTRST),
+	PAD_CFG_GPI_APIC_HIGH(GPP_F13, NONE, PLTRST),
+	PAD_CFG_GPI_APIC_LOW(GPP_F14, NONE, DEEP),
 	PAD_CFG_NF(GPP_F15, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_F16, NONE, DEEP, NF1),
 	PAD_CFG_NF(GPP_F17, NONE, DEEP, NF1),
@@ -154,23 +154,23 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_GPI_SCI_LOW(GPP_G2, NONE, PLTRST, LEVEL),
 	PAD_CFG_GPI_SCI_LOW(GPP_G3, NONE, PLTRST, LEVEL),
 	PAD_CFG_GPO(GPP_G4, 1, DEEP),
-	PAD_CFG_GPI_APIC(GPP_G5, NONE, PLTRST),
-	PAD_CFG_GPI_ACPI_SCI(GPP_G6, NONE, PLTRST, YES),
+	PAD_CFG_GPI_APIC_HIGH(GPP_G5, NONE, PLTRST),
+	PAD_CFG_GPI_SCI(GPP_G6, NONE, PLTRST, EDGE_SINGLE, INVERT),
 	PAD_CFG_GPO(GPP_G7, 1, DEEP),
 	PAD_CFG_GPI_INT(GPP_G8, NONE, PLTRST, OFF),
 	PAD_CFG_GPI_INT(GPP_G9, NONE, PLTRST, OFF),
 	PAD_CFG_GPI_INT(GPP_G10, NONE, PLTRST, OFF),
 	PAD_CFG_GPI_INT(GPP_G11, NONE, PLTRST, OFF),
-	PAD_CFG_GPI_ACPI_SCI(GPP_G12, 20K_PD, PLTRST, YES),
+	PAD_CFG_GPI_SCI(GPP_G12, DN_20K, PLTRST, EDGE_SINGLE, INVERT),
 	PAD_CFG_GPO(GPP_G13, 1, PLTRST),
-	PAD_CFG_GPI_ACPI_SCI(GPP_G14, NONE, PLTRST, YES),
+	PAD_CFG_GPI_SCI(GPP_G14, NONE, PLTRST, EDGE_SINGLE, INVERT),
 	PAD_CFG_GPO(GPP_G15, 0, PLTRST),
-	PAD_CFG_TERM_GPO(GPP_G16, 1, 20K_PD, PLTRST),
+	PAD_CFG_TERM_GPO(GPP_G16, 1, DN_20K, PLTRST),
 	PAD_CFG_GPI_INT(GPP_G17, NONE, PLTRST, OFF),
-	PAD_CFG_GPI_APIC(GPP_G18, NONE, PLTRST),
+	PAD_CFG_GPI_APIC_HIGH(GPP_G18, NONE, PLTRST),
 	PAD_CFG_NF(GPP_G19, NONE, PLTRST, NF1),
-	PAD_CFG_GPI_APIC(GPP_G20, NONE, PLTRST),
-	PAD_CFG_GPI_ACPI_SCI(GPP_G21, NONE, DEEP, YES),
+	PAD_CFG_GPI_APIC_HIGH(GPP_G20, NONE, PLTRST),
+	PAD_CFG_GPI_SCI(GPP_G21, NONE, DEEP, EDGE_SINGLE, INVERT),
 	PAD_CFG_GPO(GPP_G22, 1, PLTRST),
 	PAD_CFG_GPO(GPP_G23, 1, PLTRST),
 
@@ -187,9 +187,9 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_GPI_INT(GPP_H10, NONE, PLTRST, OFF),
 	PAD_CFG_GPI_INT(GPP_H11, NONE, PLTRST, OFF),
 	PAD_CFG_GPI_INT(GPP_H12, NONE, PLTRST, OFF),
-	PAD_CFG_GPI_APIC(GPP_H13, NONE, PLTRST),
-	PAD_CFG_GPI_APIC(GPP_H14, NONE, PLTRST),
-	PAD_CFG_GPI_APIC(GPP_H15, NONE, PLTRST),
+	PAD_CFG_GPI_APIC_HIGH(GPP_H13, NONE, PLTRST),
+	PAD_CFG_GPI_APIC_HIGH(GPP_H14, NONE, PLTRST),
+	PAD_CFG_GPI_APIC_HIGH(GPP_H15, NONE, PLTRST),
 	PAD_CFG_GPI_INT(GPP_H16, NONE, PLTRST, OFF),
 	PAD_CFG_GPO(GPP_H17, 1, PLTRST),
 	PAD_CFG_GPI_INT(GPP_H18, NONE, PLTRST, OFF),
@@ -202,7 +202,7 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_GPI_INT(GPD0, NONE, PLTRST, OFF),
 	PAD_CFG_GPO(GPD1, 0, PWROK),
 	PAD_CFG_NF(GPD2, NONE, 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),