From a88ed3f87a6c8ae281702a133ea7cee14e92a6c9 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Tue, 6 Oct 2020 11:57:12 -0600 Subject: [PATCH] mb/system76/oryp5: gpio: Convert raw pads to macros Tested with BUILD_TIMELESS=1 Change-Id: I5e9c2eae1245690e1efccf1211dcaee831067436 Signed-off-by: Tim Crawford --- src/mainboard/system76/oryp5/gpio.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mainboard/system76/oryp5/gpio.h b/src/mainboard/system76/oryp5/gpio.h index b98d1e66c7..54f7a485f8 100644 --- a/src/mainboard/system76/oryp5/gpio.h +++ b/src/mainboard/system76/oryp5/gpio.h @@ -43,7 +43,7 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NF(GPP_A8, NONE, DEEP, NF1), // PM_CLKRUN# PAD_CFG_NF(GPP_A9, NONE, DEEP, NF1), // PCLK_KBC PAD_CFG_NF(GPP_A10, NONE, DEEP, NF1), // NC - _PAD_CFG_STRUCT(GPP_A11, 0x80100100, 0x0000), // INTP_OUT + PAD_CFG_GPI_APIC_HIGH(GPP_A11, NONE, PLTRST), // INTP_OUT PAD_CFG_GPI(GPP_A12, UP_20K, DEEP), // NC PAD_CFG_GPI(GPP_A13, UP_20K, DEEP), // SUSWARN# PAD_CFG_GPI(GPP_A14, UP_20K, DEEP), // NC (test point) @@ -76,10 +76,10 @@ static const struct pad_config gpio_table[] = { PAD_CFG_GPI(GPP_B17, UP_20K, DEEP), // NC PAD_CFG_GPI(GPP_B18, UP_20K, DEEP), // LPSS_GSPI0_MOSI PAD_CFG_GPI(GPP_B19, UP_20K, DEEP), // NC - _PAD_CFG_STRUCT(GPP_B20, 0x42040100, 0x0000), // SMI# + PAD_CFG_GPI_SMI(GPP_B20, NONE, DEEP, EDGE_SINGLE, NONE), // SMI# PAD_CFG_GPI(GPP_B21, UP_20K, DEEP), // NC PAD_CFG_GPI(GPP_B22, UP_20K, DEEP), // LPSS_GSPI1_MOSI - _PAD_CFG_STRUCT(GPP_B23, 0x80880100, 0x3000), // SCI# + PAD_CFG_GPI_SCI_LOW(GPP_B23, UP_20K, PLTRST, LEVEL), // SCI# PAD_CFG_NF(GPP_C0, NONE, DEEP, NF1), // SMB_CLK PAD_CFG_NF(GPP_C1, NONE, DEEP, NF1), // SMB_DATA PAD_CFG_GPI(GPP_C2, UP_20K, DEEP), // GPP_C2_BT_UART_WAKE_N @@ -135,7 +135,7 @@ static const struct pad_config gpio_table[] = { PAD_CFG_GPI(GPP_E4, UP_20K, DEEP), // NC PAD_CFG_GPI(GPP_E5, UP_20K, DEEP), // M2_P0_SATA_DEVSLP PAD_CFG_GPI(GPP_E6, UP_20K, DEEP), // NC - PAD_CFG_GPI_APIC(GPP_E7, NONE, PLTRST, EDGE_SINGLE, INVERT), // TP_ATTN# + PAD_CFG_GPI_APIC_EDGE_LOW(GPP_E7, NONE, PLTRST), // TP_ATTN# PAD_CFG_NF(GPP_E8, NONE, DEEP, NF1), // PCH_SATAHDD_LED# PAD_CFG_GPI(GPP_E9, UP_20K, DEEP), // USB_OC0# ==> NC (test point) PAD_CFG_GPI(GPP_E10, UP_20K, DEEP), // USB_OC1# ==> NC (test point) @@ -171,7 +171,7 @@ static const struct pad_config gpio_table[] = { PAD_CFG_GPI(GPP_G3, UP_20K, DEEP), // NC PAD_CFG_GPI(GPP_G4, UP_20K, DEEP), // NC PAD_CFG_GPI(GPP_G5, UP_20K, DEEP), // NC - _PAD_CFG_STRUCT(GPP_G6, 0x40880100, 0x0000), // SWI# + PAD_CFG_GPI_SCI_LOW(GPP_G6, NONE, DEEP, LEVEL), // SWI# PAD_CFG_GPI(GPP_G7, UP_20K, DEEP), // NC PAD_CFG_TERM_GPO(GPP_H0, 0, NONE, PLTRST), // NC PAD_CFG_TERM_GPO(GPP_H1, 0, NONE, PLTRST), // NC @@ -197,9 +197,9 @@ static const struct pad_config gpio_table[] = { PAD_CFG_GPI(GPP_H21, DN_20K, DEEP), // 4.7k pull up, 20k pull down PAD_CFG_GPI(GPP_H22, UP_20K, DEEP), // NC PAD_CFG_GPI(GPP_H23, UP_20K, DEEP), // NC - _PAD_CFG_STRUCT(GPP_I0, 0x46880100, 0x0000), // G_DP_DHPD_A - _PAD_CFG_STRUCT(GPP_I1, 0x46880100, 0x0000), // HDMI_HPD - _PAD_CFG_STRUCT(GPP_I2, 0x46880100, 0x0000), // G_DP_DHPD_E + PAD_CFG_GPI_SCI_LOW(GPP_I0, NONE, DEEP, EDGE_BOTH), // G_DP_DHPD_A + PAD_CFG_GPI_SCI_LOW(GPP_I1, NONE, DEEP, EDGE_BOTH), // HDMI_HPD + PAD_CFG_GPI_SCI_LOW(GPP_I2, NONE, DEEP, EDGE_BOTH), // G_DP_DHPD_E PAD_CFG_GPI(GPP_I3, UP_20K, DEEP), // NC PAD_CFG_NF(GPP_I4, NONE, DEEP, NF1), // EDP_HDP PAD_CFG_GPI(GPP_I5, UP_20K, DEEP), // NC