[M] Change in coreboot[main]: mb/starlabs/starbook/*: Tidy GPIO comments for the touchpad
Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/87102?usp=email )
Change subject: mb/starlabs/starbook/*: Tidy GPIO comments for the touchpad ......................................................................
mb/starlabs/starbook/*: Tidy GPIO comments for the touchpad
This is a non-functional change, and only makes the GPIOs easier to read.
Change-Id: I9563f1d3f464b3be35d18d6cd6fbbcee314fce28 Signed-off-by: Sean Rhodes sean@starlabs.systems Reviewed-on: https://review.coreboot.org/c/coreboot/+/87102 Reviewed-by: Matt DeVillier matt.devillier@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/starlabs/starbook/variants/adl/gpio.c M src/mainboard/starlabs/starbook/variants/cml/gpio.c M src/mainboard/starlabs/starbook/variants/kbl/gpio.c M src/mainboard/starlabs/starbook/variants/mtl/gpio.c M src/mainboard/starlabs/starbook/variants/rpl/gpio.c M src/mainboard/starlabs/starbook/variants/tgl/gpio.c M src/mainboard/starlabs/starfighter/variants/rpl/gpio.c 7 files changed, 35 insertions(+), 42 deletions(-)
Approvals: Matt DeVillier: Looks good to me, approved build bot (Jenkins): Verified
diff --git a/src/mainboard/starlabs/starbook/variants/adl/gpio.c b/src/mainboard/starlabs/starbook/variants/adl/gpio.c index 0e6816d..38aefd0e 100644 --- a/src/mainboard/starlabs/starbook/variants/adl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/adl/gpio.c @@ -34,6 +34,11 @@ // PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_A9, UP_20K, DEEP, NF1), /* eSPI Clk */ // PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_A10, NONE, DEEP, NF1), /* eSPI Reset */
+ /* Touchpad */ + PAD_CFG_NF(GPP_H4, NONE, DEEP, NF1), /* Data */ + PAD_CFG_NF(GPP_H5, NONE, DEEP, NF1), /* Clock */ + PAD_CFG_GPI_APIC_LOW(GPP_E12, NONE, PLTRST), /* Interrupt */ + /* GPD2: LAN Wake */ PAD_NC(GPD2, NONE), /* GPD6: Sleep A */ @@ -259,8 +264,6 @@ PAD_NC(GPP_E10, NONE), /* E11: TPM IRQ */ PAD_CFG_GPI_APIC_LOW(GPP_E11, NONE, PLTRST), - /* E12: Touchpad Interrupt */ - PAD_CFG_GPI_APIC_LOW(GPP_E12, NONE, PLTRST), /* E13: Not connected */ PAD_NC(GPP_E13, NONE), /* E14: EDP HPD */ @@ -343,10 +346,6 @@ PAD_CFG_GPO(GPP_H2, 1, PLTRST), /* H3: Not Connected */ PAD_NC(GPP_H3, NONE), - /* H4: I2C 0 SDA Touchpad */ - PAD_CFG_NF(GPP_H4, NONE, DEEP, NF1), - /* H5: I2C 0 SDL Touchpad */ - PAD_CFG_NF(GPP_H5, NONE, DEEP, NF1), /* H6: Not Connected */ PAD_NC(GPP_H6, NONE), /* H7: Not Connected */ diff --git a/src/mainboard/starlabs/starbook/variants/cml/gpio.c b/src/mainboard/starlabs/starbook/variants/cml/gpio.c index da73483..7958b40 100644 --- a/src/mainboard/starlabs/starbook/variants/cml/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/cml/gpio.c @@ -34,6 +34,11 @@ PAD_CFG_NF(GPD5, NONE, DEEP, NF1), /* Sleep S4 */ PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* Bluetooth Suspend */
+ /* Touchpad */ + PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1), /* Data */ + PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1), /* Clock */ + PAD_CFG_GPI_APIC_LOW(GPP_B3, NONE, PLTRST), /* Interrupt */ + /* GPD2: LAN_WAKE# */ PAD_NC(GPD2, NONE), /* GPD6: SIO_SLP_A# */ @@ -102,8 +107,6 @@ PAD_NC(GPP_B1, NONE), /* B2: Not Connected */ PAD_NC(GPP_B2, NONE), - /* B3: CLICK_PAD_INT_R_N */ - PAD_CFG_GPI_APIC_LOW(GPP_B3, NONE, PLTRST), /* B4: BT_RF_KILL_N */ PAD_CFG_GPO(GPP_B4, 1, DEEP), /* B5: WLAN_CLKREQ# */ @@ -177,10 +180,6 @@ PAD_NC(GPP_C14, NONE), /* C15: TBT_RST_N */ PAD_NC(GPP_C15, NONE), - /* C16: I2C0_SDA */ - PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1), - /* C17: I2C0_SCL */ - PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1), /* C18: TOUCH_I2C_SDA */ PAD_NC(GPP_C18, NONE), /* C19: TOUCH_I2C_SDL */ diff --git a/src/mainboard/starlabs/starbook/variants/kbl/gpio.c b/src/mainboard/starlabs/starbook/variants/kbl/gpio.c index 6cffc5f..d9a075b 100644 --- a/src/mainboard/starlabs/starbook/variants/kbl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/kbl/gpio.c @@ -25,6 +25,11 @@ PAD_CFG_NF(GPD5, NONE, PWROK, NF1), /* Sleep S4 */ PAD_CFG_NF(GPD8, NONE, PWROK, NF1), /* Bluetooth Suspend */
+ /* Touchpad */ + PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1), /* Data */ + PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1), /* Clock */ + PAD_CFG_GPI_APIC_LOW(GPP_C23, NONE, PLTRST), /* Interrupt */ + /* GPD2: Not Connected */ PAD_NC(GPD2, NONE), /* GPD6: Not Connected */ @@ -165,18 +170,12 @@ PAD_NC(GPP_C14, UP_20K), /* GPP_C15: Not Connected */ PAD_NC(GPP_C15, UP_20K), - /* GPP_C16: DAT_I2C_TP */ - PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1), - /* GPP_C17: CLK_I2C_TP */ - PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1), /* GPP_C18: TOUCH_I2C_SDA */ PAD_CFG_NF(GPP_C18, NONE, DEEP, NF1), /* GPP_C19: TOUCH_I2C_CLK */ PAD_CFG_NF(GPP_C19, NONE, DEEP, NF1), /* GPP_C22: Not Connected */ PAD_NC(GPP_C22, NONE), - /* GPP_C23: TOUCHPAD_INT */ - PAD_CFG_GPI_APIC_LOW(GPP_C23, NONE, PLTRST), /* GPP_D0: Not Connected */ PAD_NC(GPP_D0, DN_20K), /* GPP_D1: Not Connected */ diff --git a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c index c5e3c26..468b4a7 100644 --- a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c @@ -39,6 +39,11 @@ // PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_A05, UP_20K, DEEP, NF1), /* eSPI Clk */ // PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_A06, NONE, DEEP, NF1), /* eSPI Reset */
+ /* Touchpad */ + PAD_CFG_NF(GPP_H19, NONE, DEEP, NF1), /* Data */ + PAD_CFG_NF(GPP_H20, NONE, DEEP, NF1), /* Clock */ + PAD_CFG_GPI_APIC(GPP_B00, NONE, DEEP, LEVEL, INVERT), /* Interrupt */ + /* V02: PCIE_WAKE_LAN */ PAD_NC(GPP_V02, NONE), /* V06: GPD_6_SLP_A_N */ @@ -272,10 +277,6 @@ PAD_CFG_NF(GPP_H17, NONE, DEEP, NF1), /* H18: */ PAD_NC(GPP_H18, NONE), - /* H19: TCHPAD_I2C0_SDA_N */ - PAD_CFG_NF(GPP_H19, NONE, DEEP, NF1), - /* H20: TCHPAD_I2C0_SCL_N */ - PAD_CFG_NF(GPP_H20, NONE, DEEP, NF1), /* H21: */ PAD_NC(GPP_H21, NONE), /* H22: */ @@ -373,8 +374,6 @@ * Start: GPP_B00 * End: GPP_B23 */ - /* B00: TCHPAD_INT_N */ - PAD_CFG_GPI_APIC(GPP_B00, NONE, DEEP, LEVEL, INVERT), /* B01: */ PAD_NC(GPP_B01, NONE), /* B02: */ diff --git a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c index 817230a..96e9797 100644 --- a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c @@ -34,6 +34,11 @@ // PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_A9, UP_20K, DEEP, NF1), /* eSPI Clk */ // PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_A10, NONE, DEEP, NF1), /* eSPI Reset */
+ /* Touchpad */ + PAD_CFG_NF(GPP_H4, NONE, DEEP, NF1), /* Data */ + PAD_CFG_NF(GPP_H5, NONE, DEEP, NF1), /* Clock */ + PAD_CFG_GPI_APIC_LOW(GPP_E12, NONE, PLTRST), /* Interrupt */ + /* GPD2: LAN Wake */ PAD_NC(GPD2, NONE), /* GPD6: Sleep A */ @@ -260,8 +265,6 @@ PAD_NC(GPP_E10, NONE), /* E11: TPM IRQ */ PAD_CFG_GPI_APIC_LOW(GPP_E11, NONE, PLTRST), - /* E12: Touchpad Interrupt */ - PAD_CFG_GPI_APIC_LOW(GPP_E12, NONE, PLTRST), /* E13: Not connected */ PAD_NC(GPP_E13, NONE), /* E14: EDP HPD */ @@ -344,10 +347,6 @@ PAD_CFG_GPO(GPP_H2, 1, PLTRST), /* H3: Not Connected */ PAD_NC(GPP_H3, NONE), - /* H4: I2C 0 SDA Touchpad */ - PAD_CFG_NF(GPP_H4, NONE, DEEP, NF1), - /* H5: I2C 0 SDL Touchpad */ - PAD_CFG_NF(GPP_H5, NONE, DEEP, NF1), /* H6: Not Connected */ PAD_NC(GPP_H6, NONE), /* H7: Not Connected */ diff --git a/src/mainboard/starlabs/starbook/variants/tgl/gpio.c b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c index 3c19970..f8e178d 100644 --- a/src/mainboard/starlabs/starbook/variants/tgl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c @@ -25,6 +25,11 @@ PAD_CFG_NF(GPD5, NONE, DEEP, NF1), /* Sleep S4 */ PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* Bluetooth Suspend */
+ /* Touchpad */ + PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1), /* Data */ + PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1), /* Clock */ + PAD_CFG_GPI_APIC_LOW(GPP_C8, NONE, PLTRST), /* Interrupt */ + /* GPD2: LAN_WAKE# */ PAD_NC(GPD2, NONE), /* GPD6: SIO_SLP_A# */ @@ -139,8 +144,6 @@ PAD_CFG_NF(GPP_C6, NONE, PWROK, NF1), /* C7: SML1_DATA */ PAD_CFG_NF(GPP_C7, NONE, PWROK, NF1), - /* C8: CLICK_PAD_INT_N */ - PAD_CFG_GPI_APIC_LOW(GPP_C8, NONE, PLTRST), /* C9: Not Connected */ PAD_NC(GPP_C9, NONE), /* C10: Not Connected */ @@ -155,10 +158,6 @@ PAD_CFG_NF(GPP_C14, NONE, DEEP, NF1), /* C15: TPM_RST */ PAD_NC(GPP_C15, NONE), - /* C16: I2C0_SDA */ - PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1), - /* C17: I2C0_SCL */ - PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1), /* C18: TOUCH_I2C_SDA */ PAD_CFG_NF(GPP_C18, NONE, DEEP, NF1), /* C19: TOUCH_I2C_CLK */ diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c index 4f46467..5cb167a 100644 --- a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c +++ b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c @@ -44,6 +44,11 @@ // PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_A9, UP_20K, DEEP, NF1), /* eSPI Clk */ // PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_A10, NONE, DEEP, NF1), /* eSPI Reset */
+ /* Touchpad */ + PAD_CFG_NF(GPP_H4, NONE, DEEP, NF1), /* Data */ + PAD_CFG_NF(GPP_H5, NONE, DEEP, NF1), /* Clock */ + PAD_CFG_GPI_APIC_LOW(GPP_D11, NONE, PLTRST), /* Interrupt */ + /* GPD2: LAN Wake */ PAD_NC(GPD2, NONE), /* GPD6: Sleep A */ @@ -220,8 +225,6 @@ PAD_NC(GPP_D9, NONE), /* D10: TPM_IRQ */ PAD_CFG_GPI_APIC_LOW(GPP_D10, NONE, PLTRST), - /* D11: TCHPAD_INT_N */ - PAD_CFG_GPI_APIC_LOW(GPP_D11, NONE, PLTRST), /* D12: ES8336_INT_N */ PAD_NC(GPP_D12, NONE), /* D13: Wireless LAN Wake */ @@ -341,10 +344,6 @@ PAD_CFG_GPO(GPP_H2, 1, PLTRST), /* H3: Not Connected */ PAD_NC(GPP_H3, NONE), - /* H4: I2C 0 SDA Touchpad */ - PAD_CFG_NF(GPP_H4, NONE, DEEP, NF1), - /* H5: I2C 0 SDL Touchpad */ - PAD_CFG_NF(GPP_H5, NONE, DEEP, NF1), /* H6: Not Connected */ PAD_NC(GPP_H6, NONE), /* H7: Not Connected */
-
Sean Rhodes (Code Review)