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

diff --git a/src/mainboard/google/poppy/variants/baseboard/gpio.c b/src/mainboard/google/poppy/variants/baseboard/gpio.c
index 072b7618a0..dd97d1c6c4 100644
--- a/src/mainboard/google/poppy/variants/baseboard/gpio.c
+++ b/src/mainboard/google/poppy/variants/baseboard/gpio.c
@@ -8,25 +8,25 @@
 /* Leave eSPI pins untouched from default settings */
 static const struct pad_config gpio_table[] = {
 	/* A0  : RCIN# ==> NC(TP41) */
-	PAD_CFG_NC(GPP_A0),
+	PAD_NC(GPP_A0, NONE),
 	/* A1  : ESPI_IO0 */
 	/* A2  : ESPI_IO1 */
 	/* A3  : ESPI_IO2 */
 	/* A4  : ESPI_IO3 */
 	/* A5  : ESPI_CS# */
 	/* A6  : SERIRQ ==> NC(TP44) */
-	PAD_CFG_NC(GPP_A6),
+	PAD_NC(GPP_A6, NONE),
 	/* A7  : PIRQA# ==> NC(TP29) */
-	PAD_CFG_NC(GPP_A7),
+	PAD_NC(GPP_A7, NONE),
 	/* A8  : CLKRUN# ==> NC(TP45) */
-	PAD_CFG_NC(GPP_A8),
+	PAD_NC(GPP_A8, NONE),
 	/* A9  : ESPI_CLK */
 	/* A10 : CLKOUT_LPC1 ==> NC */
-	PAD_CFG_NC(GPP_A10),
+	PAD_NC(GPP_A10, NONE),
 	/* A11 : PME# ==> NC(TP67) */
-	PAD_CFG_NC(GPP_A11),
+	PAD_NC(GPP_A11, NONE),
 	/* A12 : BM_BUSY# ==> NC */
-	PAD_CFG_NC(GPP_A12),
+	PAD_NC(GPP_A12, NONE),
 	/* A13 : SUSWARN# ==> SUSWARN_L */
 	PAD_CFG_NF(GPP_A13, NONE, DEEP, NF1),
 	/* A14 : ESPI_RESET# */
@@ -37,30 +37,30 @@ static const struct pad_config gpio_table[] = {
 	/* A17 : SD_PWR_EN# ==> EN_SD_SOCKET_PWR_L */
 	PAD_CFG_NF(GPP_A17, NONE, DEEP, NF1),
 	/* A18 : ISH_GP0 ==> NC */
-	PAD_CFG_NC(GPP_A18),
+	PAD_NC(GPP_A18, NONE),
 	/* A19 : ISH_GP1 ==> NC */
-	PAD_CFG_NC(GPP_A19),
+	PAD_NC(GPP_A19, NONE),
 	/* A20 : ISH_GP2 ==> ACCEL_GYRO_INT_L */
-	PAD_CFG_GPI_APIC(GPP_A20, NONE, PLTRST),
+	PAD_CFG_GPI_APIC_HIGH(GPP_A20, NONE, PLTRST),
 	/* A21 : ISH_GP3 ==> NC */
-	PAD_CFG_NC(GPP_A21),
+	PAD_NC(GPP_A21, NONE),
 	/* A22 : ISH_GP4 ==> NC */
-	PAD_CFG_NC(GPP_A22),
+	PAD_NC(GPP_A22, NONE),
 	/* A23 : ISH_GP5 ==> NC */
-	PAD_CFG_NC(GPP_A23),
+	PAD_NC(GPP_A23, NONE),
 
 	/* B0  : CORE_VID0 ==> WLAN_PCIE_WAKE_L */
-	PAD_CFG_GPI_ACPI_SCI(GPP_B0, NONE, DEEP, INVERT),
+	PAD_CFG_GPI_SCI(GPP_B0, NONE, DEEP, EDGE_SINGLE, INVERT),
 	/* B1  : CORE_VID1 ==> NC(TP43) */
-	PAD_CFG_NC(GPP_B1),
+	PAD_NC(GPP_B1, NONE),
 	/* B2  : VRALERT# ==> NC */
-	PAD_CFG_NC(GPP_B2),
+	PAD_NC(GPP_B2, NONE),
 	/* B3  : CPU_GP2 ==> NC */
-	PAD_CFG_NC(GPP_B3),
+	PAD_NC(GPP_B3, NONE),
 	/* B4  : CPU_GP3 ==> NC */
-	PAD_CFG_NC(GPP_B4),
+	PAD_NC(GPP_B4, NONE),
 	/* B5  : SRCCLKREQ0# ==> NC */
-	PAD_CFG_NC(GPP_B5),
+	PAD_NC(GPP_B5, NONE),
 	/* B6  : SRCCLKREQ1# ==> WLAN_PCIE_CLKREQ_L */
 	PAD_CFG_NF(GPP_B6, NONE, DEEP, NF1),
 	/* B7  : SRCCLKREQ2# ==> WWAN_PCIE_CLKREQ_L */
@@ -68,54 +68,54 @@ static const struct pad_config gpio_table[] = {
 	/* B8  : SRCCLKREQ3# ==> WLAN_PE_RST */
 	PAD_CFG_GPO(GPP_B8, 0, RSMRST),
 	/* B9  : SRCCLKREQ4# ==> NC */
-	PAD_CFG_NC(GPP_B9),
+	PAD_NC(GPP_B9, NONE),
 	/* B10 : SRCCLKREQ5# ==> NC */
-	PAD_CFG_NC(GPP_B10),
+	PAD_NC(GPP_B10, NONE),
 	/* B11 : EXT_PWR_GATE# ==> NC */
-	PAD_CFG_NC(GPP_B11),
+	PAD_NC(GPP_B11, NONE),
 	/* B12 : SLP_S0# ==> SLP_S0_L_G */
 	PAD_CFG_NF(GPP_B12, NONE, DEEP, NF1),
 	/* B13 : PLTRST# ==> PLT_RST_L */
 	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),
 	/* B14 : SPKR ==> NC */
-	PAD_CFG_NC(GPP_B14),
+	PAD_NC(GPP_B14, NONE),
 	/* B15 : GSPI0_CS# ==> NC */
-	PAD_CFG_NC(GPP_B15),
+	PAD_NC(GPP_B15, NONE),
 	/* B16 : GSPI0_CLK ==> NC */
-	PAD_CFG_NC(GPP_B16),
+	PAD_NC(GPP_B16, NONE),
 	/* B17 : GSPI0_MISO ==> NC */
-	PAD_CFG_NC(GPP_B17),
+	PAD_NC(GPP_B17, NONE),
 	/* B18 : GSPI0_MOSI ==> NC */
-	PAD_CFG_NC(GPP_B18),
+	PAD_NC(GPP_B18, NONE),
 	/* B19 : GSPI1_CS# ==> NC */
-	PAD_CFG_NC(GPP_B19),
+	PAD_NC(GPP_B19, NONE),
 	/* B20 : GSPI1_CLK ==> NC */
-	PAD_CFG_NC(GPP_B20),
+	PAD_NC(GPP_B20, NONE),
 	/* B21 : GSPI1_MISO ==> NC */
-	PAD_CFG_NC(GPP_B21),
+	PAD_NC(GPP_B21, NONE),
 	/* B22 : GSPI1_MOSI ==> NC */
-	PAD_CFG_NC(GPP_B22),
+	PAD_NC(GPP_B22, NONE),
 	/* B23 : SM1ALERT# ==> NC */
-	PAD_CFG_NC(GPP_B23),
+	PAD_NC(GPP_B23, NONE),
 
 	/* C0  : SMBCLK ==> NC */
-	PAD_CFG_NC(GPP_C0),
+	PAD_NC(GPP_C0, NONE),
 	/* C1  : SMBDATA ==> NC */
-	PAD_CFG_NC(GPP_C1),
+	PAD_NC(GPP_C1, NONE),
 	/* C2  : SMBALERT# ==> NC */
-	PAD_CFG_NC(GPP_C2),
+	PAD_NC(GPP_C2, NONE),
 	/* C3  : SML0CLK ==> NC */
-	PAD_CFG_NC(GPP_C3),
+	PAD_NC(GPP_C3, NONE),
 	/* C4  : SML0DATA ==> NC */
-	PAD_CFG_NC(GPP_C4),
+	PAD_NC(GPP_C4, NONE),
 	/* C5  : SML0ALERT# ==> NC */
-	PAD_CFG_NC(GPP_C5),
+	PAD_NC(GPP_C5, NONE),
 	/* C6  : SM1CLK ==> EC_IN_RW_OD */
-	PAD_CFG_GPI_GPIO_DRIVER(GPP_C6, 20K_PU, DEEP),
+	PAD_CFG_GPI_GPIO_DRIVER(GPP_C6, UP_20K, DEEP),
 	/* C7  : SM1DATA ==> NC */
-	PAD_CFG_NC(GPP_C7),
+	PAD_NC(GPP_C7, NONE),
 	/* C8  : UART0_RXD ==> FP_INT */
-	PAD_CFG_GPI_APIC(GPP_C8, NONE, PLTRST),
+	PAD_CFG_GPI_APIC_HIGH(GPP_C8, NONE, PLTRST),
 	/* C9  : UART0_TXD ==> FP_RST_ODL */
 	PAD_CFG_GPO(GPP_C9, 0, DEEP),
 	/* C10 : UART0_RTS# ==> EC_CAM_PMIC_RST_L */
@@ -145,12 +145,12 @@ static const struct pad_config gpio_table[] = {
 	/* C22 : UART2_RTS# ==> EN_PP3300_DX_TOUCHSCREEN */
 	PAD_CFG_GPO(GPP_C22, 0, DEEP),
 	/* C23 : UART2_CTS# ==> PCH_WP */
-	PAD_CFG_GPI_GPIO_DRIVER(GPP_C23, 20K_PU, DEEP),
+	PAD_CFG_GPI_GPIO_DRIVER(GPP_C23, UP_20K, DEEP),
 
 	/* D0  : SPI1_CS# ==> EN_PP3300_DX_LTE */
 	PAD_CFG_GPO(GPP_D0, 1, DEEP),
 	/* D1  : SPI1_CLK ==> PEN_IRQ_L */
-	PAD_CFG_GPI_APIC(GPP_D1, NONE, PLTRST),
+	PAD_CFG_GPI_APIC_HIGH(GPP_D1, NONE, PLTRST),
 	/* D2  : SPI1_MISO ==> PEN_PDCT_L */
 	PAD_CFG_GPI_GPIO_DRIVER(GPP_D2, NONE, DEEP),
 	/* D3  : SPI1_MOSI ==> PEN_RST_L */
@@ -162,23 +162,23 @@ static const struct pad_config gpio_table[] = {
 	/* D6  : ISH_I2C0_SCL ==> ISH_I2C_SENSOR_1V8_SCL */
 	PAD_CFG_NF_1V8(GPP_D6, NONE, DEEP, NF1),
 	/* D7  : ISH_I2C1_SDA ==> NC */
-	PAD_CFG_NC(GPP_D7),
+	PAD_NC(GPP_D7, NONE),
 	/* D8  : ISH_I2C1_SCL ==> PEN_EJECT_ODL -- for notification */
-	PAD_CFG_GPI_GPIO_DRIVER(GPP_D8, 20K_PU, DEEP),
+	PAD_CFG_GPI_GPIO_DRIVER(GPP_D8, UP_20K, DEEP),
 	/* D9  : ISH_SPI_CS# ==> HP_IRQ_GPIO */
 	PAD_CFG_GPI_GPIO_DRIVER(GPP_D9, NONE, PLTRST),
 	/* D10 : ISH_SPI_CLK ==> SPKR_RST_L */
 	PAD_CFG_GPO(GPP_D10, 1, DEEP),
 	/* D11 : ISH_SPI_MISO ==> SPKR_INT_L */
-	PAD_CFG_GPI_APIC(GPP_D11, NONE, PLTRST),
+	PAD_CFG_GPI_APIC_HIGH(GPP_D11, NONE, PLTRST),
 	/* D12 : ISH_SPI_MOSI ==> PEN_EJECT_ODL -- for wake event */
-	PAD_CFG_GPI_ACPI_SCI(GPP_D12, 20K_PU, DEEP, INVERT),
+	PAD_CFG_GPI_SCI(GPP_D12, UP_20K, DEEP, EDGE_SINGLE, INVERT),
 	/* D13 : ISH_UART0_RXD ==> NC */
-	PAD_CFG_NC(GPP_D13),
+	PAD_NC(GPP_D13, NONE),
 	/* D14 : ISH_UART0_TXD ==> NC */
-	PAD_CFG_NC(GPP_D14),
+	PAD_NC(GPP_D14, NONE),
 	/* D15 : ISH_UART0_RTS# ==> NC */
-	PAD_CFG_NC(GPP_D15),
+	PAD_NC(GPP_D15, NONE),
 	/* D16 : ISH_UART0_CTS# ==> LTE_OFF_ODL */
 	PAD_CFG_GPO(GPP_D16, 1, DEEP),
 	/* D17 : DMIC_CLK1 */
@@ -197,23 +197,23 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_D23, NONE, DEEP, NF1),
 
 	/* E0  : SATAXPCI0 ==> H1_PCH_INT_ODL */
-	PAD_CFG_GPI_APIC_INVERT(GPP_E0, NONE, PLTRST),
+	PAD_CFG_GPI_APIC_LOW(GPP_E0, NONE, PLTRST),
 	/* E1  : SATAXPCIE1 ==> NC */
-	PAD_CFG_NC(GPP_E1),
+	PAD_NC(GPP_E1, NONE),
 	/* E2  : SATAXPCIE2 ==> NC */
-	PAD_CFG_NC(GPP_E2),
+	PAD_NC(GPP_E2, NONE),
 	/* E3  : CPU_GP0 ==> TOUCHSCREEN_RST_L */
 	PAD_CFG_GPO(GPP_E3, 0, DEEP),
 	/* E4  : SATA_DEVSLP0 ==> NC */
-	PAD_CFG_NC(GPP_E4),
+	PAD_NC(GPP_E4, NONE),
 	/* E5  : SATA_DEVSLP1 ==> NC */
-	PAD_CFG_NC(GPP_E5),
+	PAD_NC(GPP_E5, NONE),
 	/* E6  : SATA_DEVSLP2 ==> NC */
-	PAD_CFG_NC(GPP_E6),
+	PAD_NC(GPP_E6, NONE),
 	/* E7  : CPU_GP1 ==> TOUCHSCREEN_INT_L */
-	PAD_CFG_GPI_APIC(GPP_E7, NONE, PLTRST),
+	PAD_CFG_GPI_APIC_HIGH(GPP_E7, NONE, PLTRST),
 	/* E8  : SATALED# ==> NC */
-	PAD_CFG_NC(GPP_E8),
+	PAD_NC(GPP_E8, NONE),
 	/* E9  : USB2_OCO# ==> USB_C0_OC_ODL */
 	PAD_CFG_NF(GPP_E9, NONE, DEEP, NF1),
 	/* E10 : USB2_OC1# ==> USB_C1_OC_ODL */
@@ -223,27 +223,27 @@ static const struct pad_config gpio_table[] = {
 	/* E12 : USB2_OC3# ==> USB2_OC3_L */
 	PAD_CFG_NF(GPP_E12, NONE, DEEP, NF1),
 	/* E13 : DDPB_HPD0 ==> USB_C0_DP_HPD */
-	PAD_CFG_NF(GPP_E13, 20K_PD, DEEP, NF1),
+	PAD_CFG_NF(GPP_E13, DN_20K, DEEP, NF1),
 	/* E14 : DDPC_HPD1 ==> USB_C1_DP_HPD */
-	PAD_CFG_NF(GPP_E14, 20K_PD, DEEP, NF1),
+	PAD_CFG_NF(GPP_E14, DN_20K, DEEP, NF1),
 	/* E15 : DDPD_HPD2 ==> SD_CD# */
-	PAD_CFG_GPI_GPIO_DRIVER(GPP_E15, 20K_PU, DEEP),
+	PAD_CFG_GPI_GPIO_DRIVER(GPP_E15, UP_20K, DEEP),
 	/* E16 : DDPE_HPD3 ==> NC(TP244) */
-	PAD_CFG_NC(GPP_E16),
+	PAD_NC(GPP_E16, NONE),
 	/* E17 : EDP_HPD */
 	PAD_CFG_NF(GPP_E17, NONE, DEEP, NF1),
 	/* E18 : DDPB_CTRLCLK ==> NC */
-	PAD_CFG_NC(GPP_E18),
+	PAD_NC(GPP_E18, NONE),
 	/* E19 : DDPB_CTRLDATA ==> NC */
-	PAD_CFG_NC(GPP_E19),
+	PAD_NC(GPP_E19, NONE),
 	/* E20 : DDPC_CTRLCLK ==> NC */
-	PAD_CFG_NC(GPP_E20),
+	PAD_NC(GPP_E20, NONE),
 	/* E21 : DDPC_CTRLDATA ==> NC */
-	PAD_CFG_NC(GPP_E21),
+	PAD_NC(GPP_E21, NONE),
 	/* E22 : DDPD_CTRLCLK ==> NC */
-	PAD_CFG_NC(GPP_E22),
+	PAD_NC(GPP_E22, NONE),
 	/* E23 : DDPD_CTRLDATA ==> NC */
-	PAD_CFG_NC(GPP_E23),
+	PAD_NC(GPP_E23, NONE),
 
 	/* The next 4 pads are for bit banging the amplifiers, default to I2S */
 	/* F0  : I2S2_SCLK ==> I2S2_SCLK_SPKR_R */
@@ -253,7 +253,7 @@ static const struct pad_config gpio_table[] = {
 	/* F2  : I2S2_TXD ==> I2S2_PCH_TX_SPKR_RX_R */
 	PAD_CFG_GPI_GPIO_DRIVER(GPP_F2, NONE, DEEP),
 	/* F3  : I2S2_RXD ==> NC */
-	PAD_CFG_NC(GPP_F3),
+	PAD_NC(GPP_F3, NONE),
 	/* F4  : I2C2_SDA ==> PCH_I2C2_CAM_PMIC_1V8_SDA */
 	PAD_CFG_NF_1V8(GPP_F4, NONE, DEEP, NF1),
 	/* F5  : I2C2_SCL ==> PCH_I2C2_CAM_PMIC_1V8_SCL */
@@ -293,7 +293,7 @@ static const struct pad_config gpio_table[] = {
 	/* F22 : EMMC_CLK */
 	PAD_CFG_NF(GPP_F22, NONE, DEEP, NF1),
 	/* F23 : RSVD ==> NC */
-	PAD_CFG_NC(GPP_F23),
+	PAD_NC(GPP_F23, NONE),
 
 	/* G0  : SD_CMD */
 	PAD_CFG_NF(GPP_G0, NONE, DEEP, NF1),
@@ -310,7 +310,7 @@ static const struct pad_config gpio_table[] = {
 	/* G6  : SD_CLK */
 	PAD_CFG_NF(GPP_G6, NONE, DEEP, NF1),
 	/* G7  : SD_WP */
-	PAD_CFG_NF(GPP_G7, 20K_PD, DEEP, NF1),
+	PAD_CFG_NF(GPP_G7, DN_20K, DEEP, NF1),
 
 	/* GPD0: BATLOW# ==> PCH_BATLOW_L */
 	PAD_CFG_NF(GPD0, NONE, DEEP, NF1),
@@ -319,23 +319,23 @@ static const struct pad_config gpio_table[] = {
 	/* GPD2: LAN_WAKE# ==> EC_PCH_WAKE_R_L */
 	PAD_CFG_NF(GPD2, NONE, DEEP, NF1),
 	/* GPD3: PWRBTN# ==> PCH_PWR_BTN_L */
-	PAD_CFG_NF(GPD3, 20K_PU, DEEP, NF1),
+	PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1),
 	/* GPD4: SLP_S3# ==> SLP_S3_L */
 	PAD_CFG_NF(GPD4, NONE, DEEP, NF1),
 	/* GPD5: SLP_S4# ==> SLP_S4_L */
 	PAD_CFG_NF(GPD5, NONE, DEEP, NF1),
 	/* GPD6: SLP_A# ==> NC(TP26) */
-	PAD_CFG_NC(GPD6),
+	PAD_NC(GPD6, NONE),
 	/* GPD7: RSVD ==> NC */
-	PAD_CFG_NC(GPD7),
+	PAD_NC(GPD7, NONE),
 	/* GPD8: SUSCLK ==> PCH_SUSCLK */
 	PAD_CFG_NF(GPD8, NONE, DEEP, NF1),
 	/* GPD9: SLP_WLAN# ==> NC(TP25) */
-	PAD_CFG_NC(GPD9),
+	PAD_NC(GPD9, NONE),
 	/* GPD10: SLP_S5# ==> NC(TP15) */
-	PAD_CFG_NC(GPD10),
+	PAD_NC(GPD10, NONE),
 	/* GPD11: LANPHYC ==> NC */
-	PAD_CFG_NC(GPD11),
+	PAD_NC(GPD11, NONE),
 };
 
 /* Early pad configuration in bootblock */
@@ -352,10 +352,10 @@ static const struct pad_config early_gpio_table[] = {
 	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),
 
 	/* C23 : UART2_CTS# ==> PCH_WP */
-	PAD_CFG_GPI_GPIO_DRIVER(GPP_C23, 20K_PU, DEEP),
+	PAD_CFG_GPI_GPIO_DRIVER(GPP_C23, UP_20K, DEEP),
 
 	/* E0  : SATAXPCI0 ==> H1_PCH_INT_ODL */
-	PAD_CFG_GPI_APIC_INVERT(GPP_E0, NONE, PLTRST),
+	PAD_CFG_GPI_APIC_LOW(GPP_E0, NONE, PLTRST),
 };
 
 const struct pad_config * __weak variant_gpio_table(size_t *num)