From cb25974f5a71e610223499dcebe3a5a6c9254f26 Mon Sep 17 00:00:00 2001 From: Chris Wang Date: Thu, 26 Oct 2017 18:40:11 +0800 Subject: google/nautilus: Update GPIO table Update GPIO settings to meet nautilus's schematic design. BRANCH=master BUG=b:66462881 TEST=emerge-nautilus coreboot Change-Id: I11930df62130431764702371a3ba84949a65ba30 Signed-off-by: Chris Wang Reviewed-on: https://review.coreboot.org/22183 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: shkim --- .../google/poppy/variants/nautilus/gpio.c | 218 +++++++++------------ 1 file changed, 93 insertions(+), 125 deletions(-) (limited to 'src/mainboard/google/poppy') diff --git a/src/mainboard/google/poppy/variants/nautilus/gpio.c b/src/mainboard/google/poppy/variants/nautilus/gpio.c index 6f7a3e70e4..713309539f 100644 --- a/src/mainboard/google/poppy/variants/nautilus/gpio.c +++ b/src/mainboard/google/poppy/variants/nautilus/gpio.c @@ -20,23 +20,23 @@ /* Pad configuration in ramstage */ /* Leave eSPI pins untouched from default settings */ static const struct pad_config gpio_table[] = { - /* A0 : RCIN# ==> NC(TP41) */ + /* A0 : RCIN# ==> NC(TP763) */ PAD_CFG_NC(GPP_A0), /* A1 : ESPI_IO0 */ /* A2 : ESPI_IO1 */ /* A3 : ESPI_IO2 */ /* A4 : ESPI_IO3 */ /* A5 : ESPI_CS# */ - /* A6 : SERIRQ ==> NC(TP44) */ + /* A6 : SERIRQ ==> NC(TP764) */ PAD_CFG_NC(GPP_A6), - /* A7 : PIRQA# ==> NC(TP29) */ + /* A7 : PIRQA# ==> NC(TP703) */ PAD_CFG_NC(GPP_A7), - /* A8 : CLKRUN# ==> NC(TP45) */ + /* A8 : CLKRUN# ==> NC(TP758)) */ PAD_CFG_NC(GPP_A8), /* A9 : ESPI_CLK */ /* A10 : CLKOUT_LPC1 ==> NC */ PAD_CFG_NC(GPP_A10), - /* A11 : PME# ==> NC(TP67) */ + /* A11 : PME# ==> NC(TP726) */ PAD_CFG_NC(GPP_A11), /* A12 : BM_BUSY# ==> NC */ PAD_CFG_NC(GPP_A12), @@ -45,61 +45,53 @@ static const struct pad_config gpio_table[] = { /* A14 : ESPI_RESET# */ /* A15 : SUSACK# ==> SUSACK_L */ PAD_CFG_NF(GPP_A15, NONE, DEEP, NF1), - /* A16 : SD_1P8_SEL ==> SD_PWR_1800_SEL */ + /* A16 : SD_1P8_SEL ==> CPU1_P1.8V_SEL */ PAD_CFG_NF(GPP_A16, NONE, DEEP, NF1), - /* A17 : SD_PWR_EN# ==> EN_SD_SOCKET_PWR_L */ + /* A17 : SD_PWR_EN# ==> CPU1_SDCARD_PWREN_L */ PAD_CFG_NF(GPP_A17, NONE, DEEP, NF1), /* A18 : ISH_GP0 ==> NC */ PAD_CFG_NC(GPP_A18), /* A19 : ISH_GP1 ==> NC */ PAD_CFG_NC(GPP_A19), - /* A20 : ISH_GP2 ==> ACCEL_GYRO_INT_L */ - PAD_CFG_GPI_APIC(GPP_A20, NONE, PLTRST), - /* A21 : ISH_GP3 ==> NC */ - PAD_CFG_NC(GPP_A21), - /* A22 : ISH_GP4 ==> NC */ - PAD_CFG_NC(GPP_A22), - /* A23 : ISH_GP5 ==> NC */ - PAD_CFG_NC(GPP_A23), + /* A20 : ISH_GP2 ==> NC */ + PAD_CFG_NC(GPP_A20), + /* A21 : ISH_GP3 ==> CHP1_DIG_PDCT_L */ + PAD_CFG_GPI_APIC(GPP_A21, NONE, PLTRST), + /* A22 : ISH_GP4 ==> CHP1_DIG_IRQ_L */ + PAD_CFG_GPI_APIC(GPP_A22, NONE, PLTRST), + /* A23 : ISH_GP5 ==> CHP1_SPK_PA_EN */ + PAD_CFG_GPO(GPP_A23, 1, DEEP), - /* B0 : CORE_VID0 ==> NC(TP42) */ + /* B0 : CORE_VID0 ==> NC(TP721) */ PAD_CFG_NC(GPP_B0), - /* B1 : CORE_VID1 ==> NC(TP43) */ + /* B1 : CORE_VID1 ==> NC(TP722) */ PAD_CFG_NC(GPP_B1), /* B2 : VRALERT# ==> NC */ PAD_CFG_NC(GPP_B2), - /* B3 : CPU_GP2 ==> NC */ - PAD_CFG_NC(GPP_B3), + /* B3 : CPU_GP2 ==> CHP3_TP_INT_L */ + PAD_CFG_GPI_APIC(GPP_B3, NONE, PLTRST), /* B4 : CPU_GP3 ==> NC */ PAD_CFG_NC(GPP_B4), - /* B5 : SRCCLKREQ0# ==> NC */ - PAD_CFG_NC(GPP_B5), - /* B6 : SRCCLKREQ1# ==> WLAN_PCIE_CLKREQ_L */ + /* B5 : SRCCLKREQ0# ==> CHP3_TP_INT_L - for wake event */ + PAD_CFG_GPI_ACPI_SCI(GPP_B5, NONE, DEEP, INVERT), + /* B6 : SRCCLKREQ1# ==> CHP3_WLAN_CLKREQ_L */ PAD_CFG_NF(GPP_B6, NONE, DEEP, NF1), /* B7 : SRCCLKREQ2# ==> NC */ PAD_CFG_NC(GPP_B7), + /* B8 : SRCCLKREQ3# ==> CHP3_WLAN_PE_RST */ + PAD_CFG_GPO(GPP_B8, 0, DEEP), /* B9 : SRCCLKREQ4# ==> NC */ PAD_CFG_NC(GPP_B9), /* B10 : SRCCLKREQ5# ==> NC */ PAD_CFG_NC(GPP_B10), /* B11 : EXT_PWR_GATE# ==> NC */ PAD_CFG_NC(GPP_B11), - /* B12 : SLP_S0# ==> SLP_S0_L_G */ + /* B12 : SLP_S0# ==> CHP3_SLPS0_L_ORG */ PAD_CFG_NF(GPP_B12, NONE, DEEP, NF1), - /* B13 : PLTRST# ==> PLT_RST_L */ + /* B13 : PLTRST# ==> PLT3_RST_L */ PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1), /* B14 : SPKR ==> NC */ PAD_CFG_NC(GPP_B14), -#if IS_ENABLED(CONFIG_POPPY_USE_SPI_TPM) - /* B15 : GSPI0_CS# ==> PCH_SPI_H1_3V3_CS_L */ - PAD_CFG_NF(GPP_B15, NONE, DEEP, NF1), - /* B16 : GSPI0_CLK ==> PCH_SPI_H1_3V3_CLK */ - PAD_CFG_NF(GPP_B16, NONE, DEEP, NF1), - /* B17 : GSPI0_MISO ==> PCH_SPI_H1_3V3_MISO */ - PAD_CFG_NF(GPP_B17, NONE, DEEP, NF1), - /* B18 : GSPI0_MOSI ==> PCH_SPI_H1_3V3_MOSI */ - PAD_CFG_NF(GPP_B18, NONE, DEEP, NF1), -#else /* B15 : GSPI0_CS# ==> NC */ PAD_CFG_NC(GPP_B15), /* B16 : GSPI0_CLK ==> NC */ @@ -108,22 +100,21 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NC(GPP_B17), /* B18 : GSPI0_MOSI ==> NC */ PAD_CFG_NC(GPP_B18), -#endif - /* B19 : GSPI1_CS# ==> NC */ - PAD_CFG_NC(GPP_B19), + /* B19 : GSPI1_CS# ==> CHP3_PEN_EJECT - for notification */ + PAD_CFG_GPI(GPP_B19, NONE, DEEP), /* B20 : GSPI1_CLK ==> NC */ PAD_CFG_NC(GPP_B20), - /* B21 : GSPI1_MISO ==> NC */ - PAD_CFG_NC(GPP_B21), + /* B21 : GSPI1_MISO ==> CHP3_PEN_EJECT - for wake event */ + PAD_CFG_GPI_ACPI_SCI(GPP_B21, NONE, DEEP, NONE), /* B22 : GSPI1_MOSI ==> NC */ PAD_CFG_NC(GPP_B22), /* B23 : SM1ALERT# ==> NC */ PAD_CFG_NC(GPP_B23), - /* C0 : SMBCLK ==> NC */ - PAD_CFG_NC(GPP_C0), - /* C1 : SMBDATA ==> NC */ - PAD_CFG_NC(GPP_C1), + /* C0 : SMBCLK ==> CHP3_SMBCLK */ + PAD_CFG_NF(GPP_C0, NONE, DEEP, NF1), + /* C1 : SMBDATA ==> CHP3_SMBDATA */ + PAD_CFG_NF(GPP_C1, NONE, DEEP, NF1), /* C2 : SMBALERT# ==> NC */ PAD_CFG_NC(GPP_C2), /* C3 : SML0CLK ==> NC */ @@ -132,17 +123,17 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NC(GPP_C4), /* C5 : SML0ALERT# ==> NC */ PAD_CFG_NC(GPP_C5), - /* C6 : SM1CLK ==> EC_IN_RW_OD */ + /* C6 : SM1CLK ==> CPU3_EC_IN_RW */ PAD_CFG_GPI(GPP_C6, 20K_PU, DEEP), /* C7 : SM1DATA ==> NC */ PAD_CFG_NC(GPP_C7), - /* C8 : UART0_RXD ==> FP_INT */ - PAD_CFG_GPI_APIC(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 */ + /* C8 : UART0_RXD ==> NC */ + PAD_CFG_NC(GPP_C8), + /* C9 : UART0_TXD ==> CHP3_P3.3V_DX_DIG_EN */ + PAD_CFG_GPO(GPP_C9, 1, DEEP), + /* C10 : UART0_RTS# ==> CHP3_CAM_PMIC_RST_L */ PAD_CFG_GPO(GPP_C10, 1, DEEP), - /* C11 : UART0_CTS# ==> EN_PP3300_DX_CAM */ + /* C11 : UART0_CTS# ==> CHP3_P3.3V_DX_CAM_EN */ PAD_CFG_GPO(GPP_C11, 1, DEEP), /* C12 : UART1_RXD ==> PCH_MEM_CONFIG[0] */ PAD_CFG_GPI(GPP_C12, NONE, DEEP), @@ -152,28 +143,21 @@ static const struct pad_config gpio_table[] = { PAD_CFG_GPI(GPP_C14, NONE, DEEP), /* C15 : UART1_CTS# ==> PCH_MEM_CONFIG[3] */ PAD_CFG_GPI(GPP_C15, NONE, DEEP), - /* C16 : I2C0_SDA ==> PCH_I2C0_TOUCHSCREEN_3V3_SDA */ + /* C16 : I2C0_SDA ==> CHP3_I2C0_TSP_SDA */ PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1), - /* C17 : I2C0_SCL ==> PCH_I2C0_TOUCHSCREEN_3V3_SCL */ + /* C17 : I2C0_SCL ==> CHP3_I2C0_TSP_SCL */ PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1), -#if IS_ENABLED(CONFIG_POPPY_USE_I2C_TPM) /* C18 : I2C1_SDA ==> PCH_I2C1_H1_3V3_SDA */ PAD_CFG_NF(GPP_C18, NONE, DEEP, NF1), /* C19 : I2C1_SCL ==> PCH_I2C1_H1_3V3_SCL */ PAD_CFG_NF(GPP_C19, NONE, DEEP, NF1), -#else - /* C18 : I2C1_SDA ==> NC */ - PAD_CFG_NC(GPP_C18), - /* C19 : I2C1_SCL ==> NC */ - PAD_CFG_NC(GPP_C19), -#endif - /* C20 : UART2_RXD ==> PCHRX_SERVOTX_UART */ + /* C20 : UART2_RXD ==> CHP3_RX_SERVO_TX_UART */ PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1), - /* C21 : UART2_TXD ==> PCHTX_SERVORX_UART */ + /* C21 : UART2_TXD ==> CHP3_TX_SERVO_RX_UART */ PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1), - /* C22 : UART2_RTS# ==> EN_PP3300_DX_TOUCHSCREEN */ + /* C22 : UART2_RTS# ==> CHP3_P3.3V_DX_TSP_EN */ PAD_CFG_GPO(GPP_C22, 0, DEEP), - /* C23 : UART2_CTS# ==> PCH_WP */ + /* C23 : UART2_CTS# ==> CHP3_PCH_WP*/ PAD_CFG_GPI(GPP_C23, 20K_PU, DEEP), /* D0 : SPI1_CS# ==> NC */ @@ -184,22 +168,22 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NC(GPP_D2), /* D3 : SPI1_MOSI ==> NC */ PAD_CFG_NC(GPP_D3), - /* D4 : FASHTRIG ==> NC */ + /* D4 : FASHTRIG ==> CHP1_VDD_CAM_CORE_EN */ PAD_CFG_NC(GPP_D4), - /* D5 : ISH_I2C0_SDA ==> ISH_I2C_SENSOR_1V8_SDA */ + /* D5 : ISH_I2C0_SDA ==> CHP1_I2C_ISH_SENSOR_SDA */ PAD_CFG_NF_1V8(GPP_D5, NONE, DEEP, NF1), - /* D6 : ISH_I2C0_SCL ==> ISH_I2C_SENSOR_1V8_SCL */ + /* D6 : ISH_I2C0_SCL ==> CHP1_I2C_ISH_SENSOR_SCL */ PAD_CFG_NF_1V8(GPP_D6, NONE, DEEP, NF1), /* D7 : ISH_I2C1_SDA ==> NC */ PAD_CFG_NC(GPP_D7), /* D8 : ISH_I2C1_SCL ==> NC */ PAD_CFG_NC(GPP_D8), - /* D9 : ISH_SPI_CS# ==> HP_IRQ_GPIO */ - PAD_CFG_GPI(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), + /* D9 : ISH_SPI_CS# ==> CHP1_HEADSET_INT_L */ + PAD_CFG_GPI_APIC_INVERT(GPP_D9, NONE, DEEP), + /* D10 : ISH_SPI_CLK ==> NC */ + PAD_CFG_NC(GPP_D10), + /* D11 : ISH_SPI_MISO ==> NC */ + PAD_CFG_NC(GPP_D11), /* D12 : ISH_SPI_MOSI ==> NC */ PAD_CFG_NC(GPP_D12), /* D13 : ISH_UART0_RXD ==> NC */ @@ -220,44 +204,44 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NF(GPP_D20, NONE, DEEP, NF1), /* D21 : SPI1_IO2 ==> NC */ PAD_CFG_NC(GPP_D21), - /* D22 : SPI1_IO3 ==> BOOT_BEEP_OVERRIDE */ + /* D22 : SPI1_IO3 ==> CHP1_BOOT_BEEP_OVERRIDE */ PAD_CFG_GPO(GPP_D22, 1, DEEP), - /* D23 : I2S_MCLK ==> I2S_MCLK_R */ + /* D23 : I2S_MCLK ==> CHP1_I2S_MCLK */ PAD_CFG_NF(GPP_D23, NONE, DEEP, NF1), - /* E0 : SATAXPCI0 ==> H1_PCH_INT_ODL */ + /* E0 : SATAXPCI0 ==> CHP3_HAVEN_INT_L */ PAD_CFG_GPI_APIC_INVERT(GPP_E0, NONE, PLTRST), /* E1 : SATAXPCIE1 ==> NC */ PAD_CFG_NC(GPP_E1), /* E2 : SATAXPCIE2 ==> NC */ PAD_CFG_NC(GPP_E2), - /* E3 : CPU_GP0 ==> TOUCHSCREEN_RST_L */ - PAD_CFG_GPO(GPP_E3, 0, DEEP), + /* E3 : CPU_GP0 ==> NC */ + PAD_CFG_NC(GPP_E3), /* E4 : SATA_DEVSLP0 ==> NC */ PAD_CFG_NC(GPP_E4), /* E5 : SATA_DEVSLP1 ==> NC */ PAD_CFG_NC(GPP_E5), /* E6 : SATA_DEVSLP2 ==> NC */ PAD_CFG_NC(GPP_E6), - /* E7 : CPU_GP1 ==> TOUCHSCREEN_INT_L */ + /* E7 : CPU_GP1 ==> CHP3_TSP_INT_L */ PAD_CFG_GPI_APIC(GPP_E7, NONE, PLTRST), /* E8 : SATALED# ==> NC */ PAD_CFG_NC(GPP_E8), - /* E9 : USB2_OCO# ==> USB_C0_OC_ODL */ + /* E9 : USB2_OCO# ==> USB3_C1_OC1_L */ PAD_CFG_NF(GPP_E9, NONE, DEEP, NF1), - /* E10 : USB2_OC1# ==> USB_C1_OC_ODL */ + /* E10 : USB2_OC1# ==> USB3_C0_OC0_L */ PAD_CFG_NF(GPP_E10, NONE, DEEP, NF1), - /* E11 : USB2_OC2# ==> TOUCHSCREEN_STOP_L */ - PAD_CFG_GPO(GPP_E11, 0, DEEP), + /* E11 : USB2_OC2# ==> NC */ + PAD_CFG_NC(GPP_E11), /* E12 : USB2_OC3# ==> USB2_OC3_L */ PAD_CFG_NF(GPP_E12, NONE, DEEP, NF1), - /* E13 : DDPB_HPD0 ==> USB_C0_DP_HPD */ + /* E13 : DDPB_HPD0 ==> KBC3_USB_C0_DP_HPD */ PAD_CFG_NF(GPP_E13, 20K_PD, DEEP, NF1), - /* E14 : DDPC_HPD1 ==> USB_C1_DP_HPD */ + /* E14 : DDPC_HPD1 ==> KBC3_USB_C1_DP_HPD */ PAD_CFG_NF(GPP_E14, 20K_PD, DEEP, NF1), - /* E15 : DDPD_HPD2 ==> SD_CD# */ + /* E15 : DDPD_HPD2 ==> CPU3_SD_CD_L */ PAD_CFG_GPI(GPP_E15, 20K_PU, DEEP), - /* E16 : DDPE_HPD3 ==> NC(TP244) */ + /* E16 : DDPE_HPD3 ==> NC(TP766) */ PAD_CFG_NC(GPP_E16), /* E17 : EDP_HPD */ PAD_CFG_NF(GPP_E17, NONE, DEEP, NF1), @@ -275,29 +259,29 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NC(GPP_E23), /* The next 4 pads are for bit banging the amplifiers, default to I2S */ - /* F0 : I2S2_SCLK ==> I2S2_SCLK_SPKR_R */ + /* F0 : I2S2_SCLK ==> CHP1_I2S2_SCLK_SPKR_R */ PAD_CFG_GPI(GPP_F0, NONE, DEEP), - /* F1 : I2S2_SFRM ==> I2S2_SFRM_SPKR_R */ + /* F1 : I2S2_SFRM ==> CHP1_I2S2_SFRM_SPKR_R*/ PAD_CFG_GPI(GPP_F1, NONE, DEEP), - /* F2 : I2S2_TXD ==> I2S2_PCH_TX_SPKR_RX_R */ + /* F2 : I2S2_TXD ==> CHP1_I2S2_PCH_TX_SPKR_RX_R */ PAD_CFG_GPI(GPP_F2, NONE, DEEP), /* F3 : I2S2_RXD */ PAD_CFG_GPI(GPP_F3, NONE, DEEP), - /* F4 : I2C2_SDA ==> PCH_I2C2_CAM_PMIC_1V8_SDA */ + /* F4 : I2C2_SDA ==> CHP1_I2C2_CAM_PMIC_SDA */ PAD_CFG_NF_1V8(GPP_F4, NONE, DEEP, NF1), - /* F5 : I2C2_SCL ==> PCH_I2C2_CAM_PMIC_1V8_SCL */ + /* F5 : I2C2_SCL ==> CHP1_I2C2_CAM_PMIC_SCL */ PAD_CFG_NF_1V8(GPP_F5, NONE, DEEP, NF1), - /* F6 : I2C3_SDA ==> PCH_I2C3_PEN_1V8_SDA */ - PAD_CFG_NF_1V8(GPP_F6, NONE, DEEP, NF1), - /* F7 : I2C3_SCL ==> PCH_I2C3_PEN_1V8_SCL */ - PAD_CFG_NF_1V8(GPP_F7, NONE, DEEP, NF1), - /* F8 : I2C4_SDA ==> PCH_I2C4_UFCAM_1V8_SDA */ + /* F6 : I2C3_SDA ==> CHP1_I2C3_DIG_SDA */ + PAD_CFG_NF_1V8(GPP_F6, 5K_PU, DEEP, NF1), + /* F7 : I2C3_SCL ==> CHP1_I2C3_DIG_SCL */ + PAD_CFG_NF_1V8(GPP_F7, 5K_PU, DEEP, NF1), + /* F8 : I2C4_SDA ==> CHP1_I2C4_TP_SDA */ PAD_CFG_NF_1V8(GPP_F8, NONE, DEEP, NF1), - /* F9 : I2C4_SCL ==> PCH_I2C4_UFCAM_1V8_SCL */ + /* F9 : I2C4_SCL ==> CHP1_I2C4_TP_SCL */ PAD_CFG_NF_1V8(GPP_F9, NONE, DEEP, NF1), - /* F10 : I2C5_SDA ==> PCH_I2C5_AUDIO_1V8_SDA */ + /* F10 : I2C5_SDA ==> CHP1_I2C5_AUDIO_SDA */ PAD_CFG_NF_1V8(GPP_F10, NONE, DEEP, NF1), - /* F11 : I2C5_SCL ==> PCH_I2C5_AUDIO_1V8_SCL */ + /* F11 : I2C5_SCL ==> CHP1_I2C5_AUDIO_SCL */ PAD_CFG_NF_1V8(GPP_F11, NONE, DEEP, NF1), /* F12 : EMMC_CMD */ PAD_CFG_NF(GPP_F12, NONE, DEEP, NF1), @@ -341,27 +325,27 @@ static const struct pad_config gpio_table[] = { /* G7 : SD_WP */ PAD_CFG_NF(GPP_G7, 20K_PD, DEEP, NF1), - /* GPD0: BATLOW# ==> PCH_BATLOW_L */ + /* GPD0: BATLOW# ==> CHP3_BATLOW# */ PAD_CFG_NF(GPD0, NONE, DEEP, NF1), - /* GPD1: ACPRESENT ==> EC_PCH_ACPRESENT */ + /* GPD1: ACPRESENT ==> KBC3_AC_PRESENT */ PAD_CFG_NF(GPD1, NONE, DEEP, NF1), - /* GPD2: LAN_WAKE# ==> EC_PCH_WAKE_R_L */ + /* GPD2: LAN_WAKE# ==> KBC3_PCH_WAKE_L */ PAD_CFG_NF(GPD2, NONE, DEEP, NF1), - /* GPD3: PWRBTN# ==> PCH_PWR_BTN_L */ + /* GPD3: PWRBTN# ==> KBC3_PWRBTN_L */ PAD_CFG_NF(GPD3, 20K_PU, DEEP, NF1), - /* GPD4: SLP_S3# ==> SLP_S3_L */ + /* GPD4: SLP_S3# ==> CHP3_SLPS3_L */ PAD_CFG_NF(GPD4, NONE, DEEP, NF1), - /* GPD5: SLP_S4# ==> SLP_S4_L */ + /* GPD5: SLP_S4# ==> CHP3_SLPS4_L */ PAD_CFG_NF(GPD5, NONE, DEEP, NF1), - /* GPD6: SLP_A# ==> NC(TP26) */ + /* GPD6: SLP_A# ==> NC(TP725) */ PAD_CFG_NC(GPD6), /* GPD7: RSVD ==> NC */ PAD_CFG_NC(GPD7), - /* GPD8: SUSCLK ==> PCH_SUSCLK */ + /* GPD8: SUSCLK ==> CHP3_SUSCLK */ PAD_CFG_NF(GPD8, NONE, DEEP, NF1), - /* GPD9: SLP_WLAN# ==> NC(TP25) */ + /* GPD9: SLP_WLAN# ==> NC(TP724) */ PAD_CFG_NC(GPD9), - /* GPD10: SLP_S5# ==> NC(TP15) */ + /* GPD10: SLP_S5# ==> NC(TP742) */ PAD_CFG_NC(GPD10), /* GPD11: LANPHYC ==> NC */ PAD_CFG_NC(GPD11), @@ -369,26 +353,10 @@ static const struct pad_config gpio_table[] = { /* Early pad configuration in bootblock */ static const struct pad_config early_gpio_table[] = { - /* B8 : SRCCLKREQ3# ==> WLAN_PE_RST */ - PAD_CFG_GPO(GPP_B8, 0, DEEP), - -#if IS_ENABLED(CONFIG_POPPY_USE_SPI_TPM) - /* B15 : GSPI0_CS# ==> PCH_SPI_H1_3V3_CS_L */ - PAD_CFG_NF(GPP_B15, NONE, DEEP, NF1), - /* B16 : GSPI0_CLK ==> PCH_SPI_H1_3V3_CLK */ - PAD_CFG_NF(GPP_B16, NONE, DEEP, NF1), - /* B17 : GSPI0_MISO ==> PCH_SPI_H1_3V3_MISO */ - PAD_CFG_NF(GPP_B17, NONE, DEEP, NF1), - /* B18 : GSPI0_MOSI ==> PCH_SPI_H1_3V3_MOSI */ - PAD_CFG_NF(GPP_B18, NONE, DEEP, NF1), -#endif - -#if IS_ENABLED(CONFIG_POPPY_USE_I2C_TPM) /* C18 : I2C1_SDA ==> PCH_I2C1_H1_3V3_SDA */ PAD_CFG_NF(GPP_C18, NONE, DEEP, NF1), /* C19 : I2C1_SCL ==> PCH_I2C1_H1_3V3_SCL */ PAD_CFG_NF(GPP_C19, NONE, DEEP, NF1), -#endif /* Ensure UART pins are in native mode for H1. */ /* C20 : UART2_RXD ==> PCHRX_SERVOTX_UART */ -- cgit v1.2.3