Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/52387 )
Change subject: mb/system76/gaze15: Leave NC GPIOs unterminated ......................................................................
mb/system76/gaze15: Leave NC GPIOs unterminated
Remove the unneeded pull up, as leaving them unterminated disconnects them from internal logic.
Also replace use of PAD_CFG_TERM_GPO with PAD_CFG_GPO, as none configure termination.
Change-Id: I28549a89a885598ba2d5111a9974356562a03cde Signed-off-by: Tim Crawford tcrawford@system76.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/52387 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/system76/gaze15/gpio.c M src/mainboard/system76/gaze15/gpio_early.c 2 files changed, 100 insertions(+), 100 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/mainboard/system76/gaze15/gpio.c b/src/mainboard/system76/gaze15/gpio.c index fcd716c..a9e6bb9 100644 --- a/src/mainboard/system76/gaze15/gpio.c +++ b/src/mainboard/system76/gaze15/gpio.c @@ -18,9 +18,9 @@ high = differential) */ PAD_CFG_NF(GPD8, NONE, DEEP, NF1), // SUS_CLK_R - PAD_NC(GPD9, UP_20K), // PCH_SLP_WLAN# (test point) + PAD_NC(GPD9, NONE), // PCH_SLP_WLAN# (test point) PAD_CFG_NF(GPD10, NONE, DEEP, NF1), // NC - PAD_NC(GPD11, UP_20K), // LAN_DISABLE_N (test point) + PAD_NC(GPD11, NONE), // LAN_DISABLE_N (test point)
/* ------- GPIO Group GPP_A ------- */ PAD_CFG_NF(GPP_A0, NONE, DEEP, NF1), // SB_KBCRST# @@ -33,44 +33,44 @@ _PAD_CFG_STRUCT(GPP_A7, 0x80100100, 0x0000), // INTP_OUT PAD_CFG_NF(GPP_A8, NONE, DEEP, NF1), // PM_CLKRUN# PAD_CFG_NF(GPP_A9, DN_20K, DEEP, NF1), // CLK_PCI_KBC_R - PAD_NC(GPP_A10, UP_20K), + PAD_NC(GPP_A10, NONE), PAD_CFG_GPI(GPP_A11, UP_20K, DEEP), // LAN_WUP# - PAD_NC(GPP_A12, UP_20K), // ISH_GP_6_R (test point) + PAD_NC(GPP_A12, NONE), // ISH_GP_6_R (test point) PAD_CFG_NF(GPP_A13, NONE, DEEP, NF1), // SUSWARN# PAD_CFG_NF(GPP_A14, NONE, DEEP, NF1), // S4_STATE# PAD_CFG_NF(GPP_A15, UP_20K, DEEP, NF1), // SUS_PWR_ACK#_R - PAD_NC(GPP_A16, UP_20K), - PAD_NC(GPP_A17, UP_20K), - PAD_CFG_TERM_GPO(GPP_A18, 1, NONE, DEEP), // SB_BLON - PAD_NC(GPP_A19, UP_20K), - PAD_NC(GPP_A20, UP_20K), - PAD_NC(GPP_A21, UP_20K), // 3G_CONFIG2 (test point) - PAD_CFG_TERM_GPO(GPP_A22, 1, NONE, DEEP), // SATA_PWR_EN - PAD_NC(GPP_A23, UP_20K), // DGPU_PWM_SELECT# (test point) + PAD_NC(GPP_A16, NONE), + PAD_NC(GPP_A17, NONE), + PAD_CFG_GPO(GPP_A18, 1, DEEP), // SB_BLON + PAD_NC(GPP_A19, NONE), + PAD_NC(GPP_A20, NONE), + PAD_NC(GPP_A21, NONE), // 3G_CONFIG2 (test point) + PAD_CFG_GPO(GPP_A22, 1, DEEP), // SATA_PWR_EN + PAD_NC(GPP_A23, NONE), // DGPU_PWM_SELECT# (test point)
/* ------- GPIO Group GPP_B ------- */ PAD_CFG_GPI(GPP_B0, NONE, DEEP),// TPM_PIRQ# - PAD_NC(GPP_B1, UP_20K), // GPP_B1 (test point) - PAD_NC(GPP_B2, UP_20K), // VRALERTB# (test point) + PAD_NC(GPP_B1, NONE), // GPP_B1 (test point) + PAD_NC(GPP_B2, NONE), // VRALERTB# (test point) PAD_CFG_GPI(GPP_B3, NONE, DEEP), // BT_EN_PCH PAD_CFG_GPI(GPP_B4, UP_20K, DEEP), // EXTTS_SNI_DRV1 - PAD_NC(GPP_B5, UP_20K), - PAD_NC(GPP_B6, UP_20K), - PAD_NC(GPP_B7, UP_20K), - PAD_NC(GPP_B8, UP_20K), - PAD_NC(GPP_B9, UP_20K), + PAD_NC(GPP_B5, NONE), + PAD_NC(GPP_B6, NONE), + PAD_NC(GPP_B7, NONE), + PAD_NC(GPP_B8, NONE), + PAD_NC(GPP_B9, NONE), PAD_CFG_NF(GPP_B10, NONE, DEEP, NF1), // LAN_CLKREQ# - PAD_NC(GPP_B11, UP_20K), + PAD_NC(GPP_B11, NONE), PAD_CFG_NF(GPP_B12, NONE, DEEP, NF1), // SLP_S0# PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1), // PLT_RST# PAD_CFG_NF(GPP_B14, NONE, DEEP, NF1), // SPKR_SMC_EXTSMI (PCH_SPKR) - PAD_NC(GPP_B15, UP_20K), - PAD_NC(GPP_B16, UP_20K), - PAD_NC(GPP_B17, UP_20K), + PAD_NC(GPP_B15, NONE), + PAD_NC(GPP_B16, NONE), + PAD_NC(GPP_B17, NONE), PAD_CFG_GPI(GPP_B18, NONE, DEEP), // LPSS_GSPI0_MOSI (no reboot) - PAD_NC(GPP_B19, UP_20K), - PAD_NC(GPP_B20, UP_20K), - PAD_NC(GPP_B21, UP_20K), + PAD_NC(GPP_B19, NONE), + PAD_NC(GPP_B20, NONE), + PAD_NC(GPP_B21, NONE), PAD_CFG_GPI(GPP_B22, NONE, DEEP), // LPSS_GSPI1_MOSI (boot strap) PAD_CFG_GPI(GPP_B23, NONE, DEEP), // PCH_HOT_GNSS_DISABLE
@@ -80,50 +80,50 @@ PAD_CFG_GPI(GPP_C2, NONE, DEEP), // SKIN_THRM_SNSR_ALERT_N PAD_CFG_GPI(GPP_C3, NONE, DEEP), // SML0_CLK PAD_CFG_GPI(GPP_C4, NONE, DEEP), // SMK0_DATA - PAD_NC(GPP_C5, UP_20K), // GPP_C5 (test point) + PAD_NC(GPP_C5, NONE), // GPP_C5 (test point) PAD_CFG_GPI(GPP_C6, NONE, DEEP), // SMC_CPU_THERM PAD_CFG_GPI(GPP_C7, NONE, DEEP), // SMD_CPU_THERM - PAD_NC(GPP_C8, UP_20K), - PAD_NC(GPP_C9, UP_20K), - PAD_NC(GPP_C10, UP_20K), - PAD_NC(GPP_C11, UP_20K), - PAD_NC(GPP_C12, UP_20K), - PAD_NC(GPP_C13, UP_20K), - PAD_NC(GPP_C14, UP_20K), - PAD_NC(GPP_C15, UP_20K), + PAD_NC(GPP_C8, NONE), + PAD_NC(GPP_C9, NONE), + PAD_NC(GPP_C10, NONE), + PAD_NC(GPP_C11, NONE), + PAD_NC(GPP_C12, NONE), + PAD_NC(GPP_C13, NONE), + PAD_NC(GPP_C14, NONE), + PAD_NC(GPP_C15, NONE), PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1), // I2C_SDA_TP PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1), // I2C_SCL_TP PAD_CFG_NF(GPP_C18, NONE, DEEP, NF1), // SMD_7411_I2C PAD_CFG_NF(GPP_C19, NONE, DEEP, NF1), // SMC_7411_I2C //PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1), // UART2_RXD //PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1), // UART2_TXD - PAD_NC(GPP_C22, UP_20K), - PAD_NC(GPP_C23, UP_20K), + PAD_NC(GPP_C22, NONE), + PAD_NC(GPP_C23, NONE),
/* ------- GPIO Group GPP_D ------- */ - PAD_NC(GPP_D0, UP_20K), - PAD_NC(GPP_D1, UP_20K), - PAD_NC(GPP_D2, UP_20K), - PAD_NC(GPP_D3, UP_20K), + PAD_NC(GPP_D0, NONE), + PAD_NC(GPP_D1, NONE), + PAD_NC(GPP_D2, NONE), + PAD_NC(GPP_D3, NONE), PAD_CFG_GPI(GPP_D4, NONE, DEEP), // I2C2_SDA PAD_CFG_NF(GPP_D5, NONE, DEEP, NF3), // CNVI_RF_RST# PAD_CFG_NF(GPP_D6, NONE, DEEP, NF3), // XTAL_CLKREQ - PAD_NC(GPP_D7, UP_20K), - PAD_NC(GPP_D8, UP_20K), - PAD_NC(GPP_D9, UP_20K), - PAD_NC(GPP_D10, UP_20K), - PAD_NC(GPP_D11, UP_20K), - PAD_NC(GPP_D12, UP_20K), - PAD_NC(GPP_D13, UP_20K), - PAD_NC(GPP_D14, UP_20K), - PAD_NC(GPP_D15, UP_20K), - PAD_NC(GPP_D16, UP_20K), + PAD_NC(GPP_D7, NONE), + PAD_NC(GPP_D8, NONE), + PAD_NC(GPP_D9, NONE), + PAD_NC(GPP_D10, NONE), + PAD_NC(GPP_D11, NONE), + PAD_NC(GPP_D12, NONE), + PAD_NC(GPP_D13, NONE), + PAD_NC(GPP_D14, NONE), + PAD_NC(GPP_D15, NONE), + PAD_NC(GPP_D16, NONE), PAD_NC(GPP_D17, NONE), // 100k pull down - PAD_NC(GPP_D18, UP_20K), + PAD_NC(GPP_D18, NONE), PAD_CFG_NF(GPP_D19, NONE, DEEP, NF1), // MIC_CLK_PCH_R PAD_CFG_NF(GPP_D20, NONE, DEEP, NF1), // MIC_DATA_PCH_R - PAD_NC(GPP_D21, UP_20K), - PAD_NC(GPP_D22, UP_20K), + PAD_NC(GPP_D21, NONE), + PAD_NC(GPP_D22, NONE), PAD_CFG_GPI(GPP_D23, NONE, DEEP), // I2C2_SCL
/* ------- GPIO Group GPP_E ------- */ @@ -133,7 +133,7 @@ PAD_CFG_GPI(GPP_E3, NONE, DEEP), // EXTTS_SNI_DRV0 PAD_CFG_GPI(GPP_E4, NONE, DEEP), // DEVSLP0 PAD_CFG_GPI(GPP_E5, NONE, DEEP), // DEVSLP1 - PAD_NC(GPP_E6, UP_20K), // PCH_MUTE# (test point) + PAD_NC(GPP_E6, NONE), // PCH_MUTE# (test point) PAD_CFG_GPI_APIC_LOW(GPP_E7, NONE, PLTRST), // TP_ATTN# PAD_CFG_NF(GPP_E8, NONE, DEEP, NF1), // SATA_LED# PAD_CFG_GPI(GPP_E9, NONE, DEEP), // USB_OC0# @@ -143,10 +143,10 @@
/* ------- GPIO Group GPP_F ------- */ PAD_CFG_GPI(GPP_F0, NONE, DEEP), // SATAGP3 - PAD_NC(GPP_F1, UP_20K), - PAD_NC(GPP_F2, UP_20K), // ODD_DA#_R (test point) - PAD_NC(GPP_F3, UP_20K), // (test point) - PAD_NC(GPP_F4, UP_20K), + PAD_NC(GPP_F1, NONE), + PAD_NC(GPP_F2, NONE), // ODD_DA#_R (test point) + PAD_NC(GPP_F3, NONE), // (test point) + PAD_NC(GPP_F4, NONE), PAD_CFG_GPI(GPP_F5, NONE, DEEP), // KBLED_DET PAD_CFG_GPI(GPP_F6, NONE, DEEP), // DEVSLP4 PAD_CFG_GPI(GPP_F7, NONE, DEEP), // LIGHT_KB_DET# @@ -164,8 +164,8 @@ //PAD_CFG_NF(GPP_F19, NONE, DEEP, NF1), // NB_ENAVDD PAD_CFG_NF(GPP_F20, NONE, DEEP, NF1), // BLON PAD_CFG_NF(GPP_F21, NONE, DEEP, NF1), // EDP_BRIGHTNESS - //PAD_CFG_TERM_GPO(GPP_F22, 1, NONE, DEEP), // DGPU_RST#_PCH - //PAD_CFG_TERM_GPO(GPP_F23, 1, NONE, DEEP), // DGPU_PWR_EN + //PAD_CFG_GPO(GPP_F22, 1, DEEP), // DGPU_RST#_PCH + //PAD_CFG_GPO(GPP_F23, 1, DEEP), // DGPU_PWR_EN
/* ------- GPIO Group GPP_G ------- */ PAD_CFG_GPI(GPP_G0, UP_20K, DEEP), // BOARD_ID1 @@ -173,21 +173,21 @@ PAD_CFG_GPI(GPP_G2, NONE, DEEP), // TPM_DET PAD_CFG_GPI(GPP_G3, NONE, DEEP), // GPIO4_1V8_MAIN_EN_R PAD_CFG_GPI(GPP_G4, NONE, DEEP), // SMI#_R - PAD_NC(GPP_G5, UP_20K), - PAD_NC(GPP_G6, UP_20K), - PAD_NC(GPP_G7, UP_20K), + PAD_NC(GPP_G5, NONE), + PAD_NC(GPP_G6, NONE), + PAD_NC(GPP_G7, NONE),
/* ------- GPIO Group GPP_H ------- */ PAD_CFG_NF(GPP_H0, NONE, DEEP, NF1), // WLAN_CLKREQ# - PAD_NC(GPP_H1, UP_20K), + PAD_NC(GPP_H1, NONE), PAD_CFG_NF(GPP_H2, NONE, DEEP, NF1), // PEG_CLKREQ# - PAD_NC(GPP_H3, UP_20K), + PAD_NC(GPP_H3, NONE), PAD_CFG_NF(GPP_H4, NONE, DEEP, NF1), // SSD_CLKREQ# PAD_CFG_NF(GPP_H5, NONE, DEEP, NF1), // SSD2_CLKREQ# - PAD_NC(GPP_H6, UP_20K), - PAD_NC(GPP_H7, UP_20K), - PAD_NC(GPP_H8, UP_20K), - PAD_NC(GPP_H9, UP_20K), + PAD_NC(GPP_H6, NONE), + PAD_NC(GPP_H7, NONE), + PAD_NC(GPP_H8, NONE), + PAD_NC(GPP_H9, NONE), PAD_NC(GPP_H10, UP_20K), // SML2CLK (test point) PAD_NC(GPP_H11, UP_20K), // SML2DATA (test point) PAD_CFG_GPI(GPP_H12, NONE, DEEP), // GPP_H_12 (eSPI flash sharing) @@ -197,10 +197,10 @@ PAD_NC(GPP_H16, UP_20K), // SML4CLK (test point) PAD_NC(GPP_H17, UP_20K), // SML4DATA (test point) PAD_NC(GPP_H18, UP_20K), // SML4ALERT# (test point) - PAD_NC(GPP_H19, UP_20K), - PAD_NC(GPP_H20, UP_20K), - PAD_NC(GPP_H21, UP_20K), - PAD_NC(GPP_H22, UP_20K), + PAD_NC(GPP_H19, NONE), + PAD_NC(GPP_H20, NONE), + PAD_NC(GPP_H21, NONE), + PAD_NC(GPP_H22, NONE), PAD_CFG_GPI(GPP_H23, NONE, DEEP), // DGPU_SELECT#
/* ------- GPIO Group GPP_I ------- */ @@ -223,12 +223,12 @@ PAD_CFG_NF(GPP_I8, NONE, DEEP, NF1), /* HDMI_CTRLDATA (on 1650/1650 Ti), test point (on 1660 Ti) */ - PAD_NC(GPP_I9, UP_20K), - PAD_NC(GPP_I10, UP_20K), + PAD_NC(GPP_I9, NONE), + PAD_NC(GPP_I10, NONE), PAD_CFG_GPI(GPP_I11, NONE, DEEP), // 10k pull up to H_SKTOCC_N - PAD_NC(GPP_I12, UP_20K), - PAD_NC(GPP_I13, UP_20K), - PAD_NC(GPP_I14, UP_20K), + PAD_NC(GPP_I12, NONE), + PAD_NC(GPP_I13, NONE), + PAD_NC(GPP_I14, NONE),
/* ------- GPIO Group GPP_J ------- */ PAD_CFG_NF(GPP_J0, NONE, DEEP, NF1), // CNVI_GNSS_PA_BLANKING @@ -241,31 +241,31 @@ PAD_CFG_NF(GPP_J7, UP_20K, DEEP, NF1), // CNVI_RGI_RSP PAD_CFG_NF(GPP_J8, NONE, DEEP, NF1), // CNVI_MFUART2_RXD PAD_CFG_NF(GPP_J9, NONE, DEEP, NF1), // CNVI_MFUART2_TXD - PAD_NC(GPP_J10, UP_20K), + PAD_NC(GPP_J10, NONE), PAD_NC(GPP_J11, NONE), // 75k pull down
/* ------- GPIO Group GPP_K ------- */ - PAD_NC(GPP_K0, UP_20K), // PCH_GPPK0_PCH_PEXVDD_EN (test point) - PAD_NC(GPP_K1, UP_20K), // PCH_GPPK1_PCH_FBVDDQ_EN (test point) - PAD_NC(GPP_K2, UP_20K), // PCH_GPPK2_PCH_1V8RUN_EN (test point) + PAD_NC(GPP_K0, NONE), // PCH_GPPK0_PCH_PEXVDD_EN (test point) + PAD_NC(GPP_K1, NONE), // PCH_GPPK1_PCH_FBVDDQ_EN (test point) + PAD_NC(GPP_K2, NONE), // PCH_GPPK2_PCH_1V8RUN_EN (test point) _PAD_CFG_STRUCT(GPP_K3, 0x80880100, 0x0000), // SCI#_R - PAD_NC(GPP_K4, UP_20K), - PAD_NC(GPP_K5, UP_20K), + PAD_NC(GPP_K4, NONE), + PAD_NC(GPP_K5, NONE), _PAD_CFG_STRUCT(GPP_K6, 0x40880100, 0x0000), // SWI#_R - PAD_NC(GPP_K7, UP_20K), - PAD_CFG_TERM_GPO(GPP_K8, 1, NONE, DEEP), // SATA_M2_PWR_EN1 - PAD_CFG_TERM_GPO(GPP_K9, 1, NONE, DEEP), // SATA_M2_PWR_EN2 - PAD_NC(GPP_K10, UP_20K), // PCH_GPPK10_PCH_NVVDD_EN (test point) - PAD_NC(GPP_K11, UP_20K), // PCH_GPPK11_PCH_NVVDD_EN (test point) - PAD_NC(GPP_K12, UP_20K), // (test point) - PAD_NC(GPP_K13, UP_20K), - PAD_CFG_TERM_GPO(GPP_K14, 0, NONE, DEEP), // GPP_K14_TEST_R - PAD_NC(GPP_K15, UP_20K), - PAD_NC(GPP_K16, UP_20K), // (test point) - PAD_NC(GPP_K17, UP_20K), - PAD_NC(GPP_K18, UP_20K), + PAD_NC(GPP_K7, NONE), + PAD_CFG_GPO(GPP_K8, 1, DEEP), // SATA_M2_PWR_EN1 + PAD_CFG_GPO(GPP_K9, 1, DEEP), // SATA_M2_PWR_EN2 + PAD_NC(GPP_K10, NONE), // PCH_GPPK10_PCH_NVVDD_EN (test point) + PAD_NC(GPP_K11, NONE), // PCH_GPPK11_PCH_NVVDD_EN (test point) + PAD_NC(GPP_K12, NONE), // (test point) + PAD_NC(GPP_K13, NONE), + PAD_CFG_GPO(GPP_K14, 0, DEEP), // GPP_K14_TEST_R + PAD_NC(GPP_K15, NONE), + PAD_NC(GPP_K16, NONE), // (test point) + PAD_NC(GPP_K17, NONE), + PAD_NC(GPP_K18, NONE), PAD_CFG_GPI(GPP_K19, NONE, DEEP), // SMI#_RR - PAD_CFG_TERM_GPO(GPP_K20, 1, NONE, DEEP), // GPU_EVENT# + PAD_CFG_GPO(GPP_K20, 1, DEEP), // GPU_EVENT# PAD_CFG_GPI(GPP_K21, NONE, PLTRST), // GC6_FB_EN_PCH PAD_CFG_GPI(GPP_K22, NONE, DEEP), // DGPU_PWRGD_R PAD_CFG_GPI(GPP_K23, NONE, DEEP), // DGPU_PRSNT# diff --git a/src/mainboard/system76/gaze15/gpio_early.c b/src/mainboard/system76/gaze15/gpio_early.c index f1a4c92..881af89 100644 --- a/src/mainboard/system76/gaze15/gpio_early.c +++ b/src/mainboard/system76/gaze15/gpio_early.c @@ -7,8 +7,8 @@ PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1), // UART2_RXD PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1), // UART2_TXD PAD_CFG_NF(GPP_F19, NONE, DEEP, NF1), // NB_ENAVDD - PAD_CFG_TERM_GPO(GPP_F22, 0, NONE, DEEP), // DGPU_RST#_PCH - PAD_CFG_TERM_GPO(GPP_F23, 0, NONE, DEEP), // DGPU_PWR_EN + PAD_CFG_GPO(GPP_F22, 0, DEEP), // DGPU_RST#_PCH + PAD_CFG_GPO(GPP_F23, 0, DEEP), // DGPU_PWR_EN };
void mainboard_configure_early_gpios(void)