[S] Change in coreboot[main]: mb/starlabs/*: Correct configuration of GPIOs used in ACPI
Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86205?usp=email )
Change subject: mb/starlabs/*: Correct configuration of GPIOs used in ACPI ......................................................................
mb/starlabs/*: Correct configuration of GPIOs used in ACPI
Correct, and unify, the configuration of the GPIOs use in ACPI for enabling and resetting: * Make all GPIOs host owned * Set enable GPIOs to DEEP * Set reset GPIOs to PLTRST
Change-Id: I31b49beeb932d9b59b094dcfe182cfc4d91c2562 Signed-off-by: Sean Rhodes sean@starlabs.systems Reviewed-on: https://review.coreboot.org/c/coreboot/+/86205 Reviewed-by: Matt DeVillier matt.devillier@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c M src/mainboard/starlabs/starbook/variants/adl/gpio.c M src/mainboard/starlabs/starbook/variants/adl_n/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 M src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c 8 files changed, 24 insertions(+), 24 deletions(-)
Approvals: build bot (Jenkins): Verified Matt DeVillier: Looks good to me, approved
diff --git a/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c b/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c index 6ae686a..f4d7ab0 100644 --- a/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c +++ b/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c @@ -229,7 +229,7 @@ /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: PCH M.2 SSD Power Enable */ - PAD_CFG_GPO(GPP_D16, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_D16, 1, DEEP, NONE), /* D17: Not Connected */ PAD_NC(GPP_D17, NONE), /* D18: Not Connected */ @@ -340,7 +340,7 @@ PAD_NC(GPP_F23, NONE),
/* H0: PCH M.2 SSD Reset */ - PAD_CFG_GPO(GPP_H0, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_H0, 1, PLTRST, NONE), /* H1: BFX Strap 2 Bit 3 Weak Internal PD 20K */ PAD_CFG_GPO(GPP_H1, 1, PLTRST), /* H2: Wireless LAN Reset */ diff --git a/src/mainboard/starlabs/starbook/variants/adl/gpio.c b/src/mainboard/starlabs/starbook/variants/adl/gpio.c index ec32e83..21821be 100644 --- a/src/mainboard/starlabs/starbook/variants/adl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/adl/gpio.c @@ -228,7 +228,7 @@ /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: PCH M.2 SSD Power Enable */ - PAD_CFG_GPO(GPP_D16, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_D16, 1, DEEP, NONE), /* D17: Not used Fingerprint ID */ PAD_NC(GPP_D17, NONE), /* D18: Not Connected */ @@ -339,11 +339,11 @@ PAD_NC(GPP_F23, NONE),
/* H0: PCH M.2 SSD Reset */ - PAD_CFG_GPO(GPP_H0, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_H0, 1, PLTRST, NONE), /* H1: BFX Strap 2 Bit 3 Weak Internal PD 20K */ PAD_CFG_GPO(GPP_H1, 0, DEEP), /* H2: Wireless LAN Reset */ - PAD_CFG_GPO(GPP_H2, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_H2, 1, PLTRST, NONE), /* H3: Not Connected */ PAD_NC(GPP_H3, NONE), /* H4: I2C 0 SDA Touchpad */ diff --git a/src/mainboard/starlabs/starbook/variants/adl_n/gpio.c b/src/mainboard/starlabs/starbook/variants/adl_n/gpio.c index 79a4c4c..b59ad9d 100644 --- a/src/mainboard/starlabs/starbook/variants/adl_n/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/adl_n/gpio.c @@ -228,7 +228,7 @@ /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: PCH M.2 SSD Power Enable */ - PAD_CFG_GPO(GPP_D16, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_D16, 1, DEEP, NONE), /* D17: Not used Fingerprint ID */ PAD_NC(GPP_D17, NONE), /* D18: Not Connected */ @@ -339,11 +339,11 @@ PAD_NC(GPP_F23, NONE),
/* H0: PCH M.2 SSD Reset */ - PAD_CFG_GPO(GPP_H0, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_H0, 1, PLTRST, NONE), /* H1: BFX Strap 2 Bit 3 Weak Internal PD 20K */ PAD_CFG_GPO(GPP_H1, 0, DEEP), /* H2: Wireless LAN Reset */ - PAD_CFG_GPO(GPP_H2, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_H2, 1, PLTRST, NONE), /* H3: Not Connected */ PAD_NC(GPP_H3, NONE), /* H4: I2C 0 SDA Touchpad */ diff --git a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c index 943998c..b3ed9e2 100644 --- a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c @@ -248,14 +248,14 @@ * End: GPP_H23 */ /* H00: M.2_PCH_SSD_RESET_N */ - PAD_CFG_GPO(GPP_H00, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_H00, 1, PLTRST, NONE), /* H01: FLASH RECOVERY * HIGH: ENABLED * LOW: DISABLED * WEAK INTERNAL PD 20K */ PAD_NC(GPP_H01, NONE), /* H02: WLAN_RST_N */ - PAD_CFG_GPO(GPP_H02, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_H02, 1, PLTRST, NONE), /* H03: */ PAD_NC(GPP_H03, NONE), /* H04: */ @@ -265,7 +265,7 @@ /* H06: */ PAD_NC(GPP_H06, NONE), /* H07: M.2_CPU_SSD_PWREN */ - PAD_CFG_GPO(GPP_H07, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_H07, 1, DEEP, NONE), /* H08: */ PAD_NC(GPP_H08, NONE), /* H09: */ diff --git a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c index a17c00f..e8c2550 100644 --- a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c @@ -224,7 +224,7 @@ /* D13: Wireless LAN Wake */ PAD_NC(GPP_D13, NONE), /* D14: CPU M.2 SSD Power Enable */ - PAD_CFG_GPO(GPP_D14, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_D14, 1, DEEP, NONE), /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: PCH M.2 SSD Power Enable */ @@ -245,7 +245,7 @@ /* E3: WiFi RF Kill */ PAD_CFG_GPO_GPIO_DRIVER(GPP_E3, 1, DEEP, NONE), /* E4: Retimer Force Power */ - PAD_CFG_GPO(GPP_E4, 0, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_E4, 0, DEEP, NONE), /* E5: Not Connected */ PAD_NC(GPP_E5, NONE), /* E6: JTAG ODT No internal PD @@ -330,7 +330,7 @@ /* F19: Not Connected */ PAD_NC(GPP_F19, NONE), /* F20: CPU M.2 SSD Reset */ - PAD_CFG_GPO(GPP_F20, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_F20, 1, PLTRST, NONE), /* F21: GPPC_F21 */ PAD_NC(GPP_F21, NONE), /* F22: Not Connected */ diff --git a/src/mainboard/starlabs/starbook/variants/tgl/gpio.c b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c index 1ba1b81..f1350c5 100644 --- a/src/mainboard/starlabs/starbook/variants/tgl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c @@ -66,7 +66,7 @@ /* A10: WLAN_PCM_IN */ PAD_NC(GPP_A10, NONE), /* A11: M2_CPU_SSD_RST_N */ - PAD_CFG_GPO(GPP_A11, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_A11, 1, PLTRST, NONE), /* A12: SATAGP_1 */ PAD_CFG_NF(GPP_A12, UP_20K, DEEP, NF1), /* A13: Not Connected */ @@ -90,7 +90,7 @@ /* A22: Not Connected */ PAD_NC(GPP_A22, NONE), /* A23: TC_RETIMER_FORCE_PWR */ - PAD_CFG_GPO(GPP_A23, 0, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_A23, 0, DEEP, NONE),
/* B0: CORE_VID_0 */ PAD_CFG_NF(GPP_B0, NONE, DEEP, NF1), @@ -219,7 +219,7 @@ /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: CPU_SSD_PWREN */ - PAD_CFG_GPO(GPP_D16, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_D16, 1, DEEP, NONE), /* D17: Not Connected */ PAD_NC(GPP_D17, NONE), /* D18: Not Connected */ diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c index 23ca3e5..e0e6164 100644 --- a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c +++ b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c @@ -229,7 +229,7 @@ /* D13: Wireless LAN Wake */ PAD_NC(GPP_D13, NONE), /* D14: CPU M.2 SSD Power Enable */ - PAD_CFG_GPO(GPP_D14, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_D14, 1, DEEP, NONE), /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: PCH M.2 SSD Power Enable */ @@ -250,7 +250,7 @@ /* E3: WiFi RF Kill */ PAD_CFG_GPO_GPIO_DRIVER(GPP_E3, 1, DEEP, NONE), /* E4: Retimer Force Power */ - PAD_CFG_GPO(GPP_E4, 0, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_E4, 0, DEEP, NONE), /* E5: Not Connected */ PAD_NC(GPP_E5, NONE), /* E6: JTAG ODT No internal PD @@ -327,7 +327,7 @@ /* F19: Not Connected */ PAD_NC(GPP_F19, NONE), /* F20: CPU M.2 SSD Reset */ - PAD_CFG_GPO(GPP_F20, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_F20, 1, PLTRST, NONE), /* F21: GPPC_F21 */ PAD_NC(GPP_F21, NONE), /* F22: Not Connected */ @@ -340,7 +340,7 @@ /* H1: BFX Strap 2 Bit 3 Weak Internal PD 20K */ PAD_CFG_GPO(GPP_H1, 0, DEEP), /* H2: Wireless LAN Reset */ - PAD_CFG_GPO(GPP_H2, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_H2, 1, PLTRST, NONE), /* H3: Not Connected */ PAD_NC(GPP_H3, NONE), /* H4: I2C 0 SDA Touchpad */ diff --git a/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c b/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c index 2ee5c67..0126a5d 100644 --- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c +++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c @@ -227,7 +227,7 @@ /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: PCH M.2 SSD Power Enable */ - PAD_CFG_GPO(GPP_D16, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_D16, 1, DEEP, NONE), /* D17: Not used Fingerprint ID */ PAD_NC(GPP_D17, NONE), /* D18: Bluetooth Wake */ @@ -323,7 +323,7 @@ /* F16: Not Connected */ PAD_NC(GPP_F16, NONE), /* F17: Touch Panel Reset */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_F17, 1, DEEP, NONE), + PAD_CFG_GPO_GPIO_DRIVER(GPP_F17, 1, PLTRST, NONE), /* F18: Touch Panel Interrupt */ PAD_CFG_GPI_APIC(GPP_F18, NONE, PLTRST, LEVEL, INVERT), /* F19: Not Connected */ @@ -338,7 +338,7 @@ PAD_NC(GPP_F23, NONE),
/* H0: PCH M.2 SSD Reset */ - PAD_CFG_GPO(GPP_H0, 1, PLTRST), + PAD_CFG_GPO_GPIO_DRIVER(GPP_H0, 1, PLTRST, NONE), /* H1: BFX Strap 2 Bit 3 Weak Internal PD 20K */ PAD_CFG_GPO(GPP_H1, 0, DEEP), /* H2: Wireless LAN Reset */
-
Sean Rhodes (Code Review)