Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86344?usp=email )
Change subject: mb/starlabs/*: Correct PAD ownership ......................................................................
mb/starlabs/*: Correct PAD ownership
Commit `57aca97a2c6e524b442c80d67b033a813bf10e8e` correctly changed the reset types of GPIOs used in ACPI, but incorrectly set the pads to GPIO mode, rather than ACPI mode.
This patch corrects that.
Change-Id: I7207d4d00e810c15d071eca0bea83796989e3735 Signed-off-by: Sean Rhodes sean@starlabs.systems Reviewed-on: https://review.coreboot.org/c/coreboot/+/86344 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Matt DeVillier matt.devillier@gmail.com --- 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/cml/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 9 files changed, 42 insertions(+), 42 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 8ec1666..6981b85 100644 --- a/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c +++ b/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c @@ -63,7 +63,7 @@ /* A12: PCH M.2 SSD PEDET */ PAD_CFG_NF(GPP_A12, NONE, DEEP, NF1), /* A13: BlueTooth RF Kill */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_A13, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_A13, 1, DEEP), /* A14: Type C VBUS OverCurrent */ PAD_CFG_NF(GPP_A14, NONE, DEEP, NF1), /* A15: Test Point 3 */ @@ -229,7 +229,7 @@ /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: PCH M.2 SSD Power Enable */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_D16, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_D16, 1, DEEP), /* D17: Not Connected */ PAD_NC(GPP_D17, NONE), /* D18: Not Connected */ @@ -244,7 +244,7 @@ /* E2: Not Connected */ PAD_NC(GPP_E2, NONE), /* E3: WiFi RF Kill */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_E3, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_E3, 1, DEEP), /* E4: Test Point 7 */ PAD_NC(GPP_E4, NONE), /* E5: Not Connected */ @@ -340,7 +340,7 @@ PAD_NC(GPP_F23, NONE),
/* H0: PCH M.2 SSD Reset */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_H0, 1, PLTRST, NONE), + PAD_CFG_GPO(GPP_H0, 1, PLTRST), /* H1: BFX Strap 2 Bit 3 Weak Internal PD 20K */ PAD_CFG_GPO(GPP_H1, 0, DEEP), /* H2: Wireless LAN Reset */ @@ -452,7 +452,7 @@ PAD_NC(GPP_R7, NONE),
/* BT_EN */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_VGPIO_0, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_VGPIO_0, 1, DEEP),
/* CNVi BT UART0 */ PAD_NC(GPP_VGPIO_6, NONE), diff --git a/src/mainboard/starlabs/starbook/variants/adl/gpio.c b/src/mainboard/starlabs/starbook/variants/adl/gpio.c index 2ab629f..4cc9888 100644 --- a/src/mainboard/starlabs/starbook/variants/adl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/adl/gpio.c @@ -63,7 +63,7 @@ /* A12: PCH M.2 SSD PEDET */ PAD_CFG_NF(GPP_A12, NONE, DEEP, NF1), /* A13: BlueTooth RF Kill */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_A13, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_A13, 1, DEEP), /* A14: Test Point 45 */ PAD_NC(GPP_A14, NONE), /* A15: Test Point 52 */ @@ -228,7 +228,7 @@ /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: PCH M.2 SSD Power Enable */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_D16, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_D16, 1, DEEP), /* D17: Not used Fingerprint ID */ PAD_NC(GPP_D17, NONE), /* D18: Not Connected */ @@ -243,7 +243,7 @@ /* E2: Not Connected */ PAD_NC(GPP_E2, NONE), /* E3: WiFi RF Kill */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_E3, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_E3, 1, DEEP), /* E4: Test Point 14 */ PAD_NC(GPP_E4, NONE), /* E5: Not Connected */ @@ -339,11 +339,11 @@ PAD_NC(GPP_F23, NONE),
/* H0: PCH M.2 SSD Reset */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_H0, 1, PLTRST, NONE), + PAD_CFG_GPO(GPP_H0, 1, PLTRST), /* H1: BFX Strap 2 Bit 3 Weak Internal PD 20K */ PAD_CFG_GPO(GPP_H1, 0, DEEP), /* H2: Wireless LAN Reset */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_H2, 1, PLTRST, NONE), + PAD_CFG_GPO(GPP_H2, 1, PLTRST), /* 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 e61c9a0..3c5c7d0 100644 --- a/src/mainboard/starlabs/starbook/variants/adl_n/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/adl_n/gpio.c @@ -63,7 +63,7 @@ /* A12: Not Connected */ PAD_NC(GPP_A12, NONE), /* A13: BlueTooth RF Kill */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_A13, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_A13, 1, DEEP), /* A14: Test Point 45 */ PAD_NC(GPP_A14, NONE), /* A15: Test Point 52 */ @@ -228,7 +228,7 @@ /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: PCH M.2 SSD Power Enable */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_D16, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_D16, 1, DEEP), /* D17: Not used Fingerprint ID */ PAD_NC(GPP_D17, NONE), /* D18: Not Connected */ @@ -243,7 +243,7 @@ /* E2: Not Connected */ PAD_NC(GPP_E2, NONE), /* E3: WiFi RF Kill */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_E3, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_E3, 1, DEEP), /* E4: Test Point 14 */ PAD_NC(GPP_E4, NONE), /* E5: Not Connected */ @@ -339,11 +339,11 @@ PAD_NC(GPP_F23, NONE),
/* H0: PCH M.2 SSD Reset */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_H0, 1, PLTRST, NONE), + PAD_CFG_GPO(GPP_H0, 1, PLTRST), /* H1: BFX Strap 2 Bit 3 Weak Internal PD 20K */ PAD_CFG_GPO(GPP_H1, 0, DEEP), /* H2: Wireless LAN Reset */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_H2, 1, PLTRST, NONE), + PAD_CFG_GPO(GPP_H2, 1, PLTRST), /* H3: Not Connected */ PAD_NC(GPP_H3, NONE), /* H4: I2C 0 SDA Touchpad */ diff --git a/src/mainboard/starlabs/starbook/variants/cml/gpio.c b/src/mainboard/starlabs/starbook/variants/cml/gpio.c index 2baac30..e29cd81 100644 --- a/src/mainboard/starlabs/starbook/variants/cml/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/cml/gpio.c @@ -116,7 +116,7 @@ /* B3: CLICK_PAD_INT_R_N */ PAD_CFG_GPI_APIC_LOW(GPP_B3, NONE, PLTRST), /* B4: BT_RF_KILL_N */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_B4, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_B4, 1, DEEP), /* B5: WLAN_CLKREQ# */ PAD_CFG_NF(GPP_B5, NONE, DEEP, NF1), /* B6: CLKREQ1_SSD_N */ @@ -161,7 +161,7 @@ /* C1: SMB_DATA */ PAD_CFG_NF(GPP_C1, NONE, DEEP, NF1), /* C2: WIFI_RF_KILL_N */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_C2, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_C2, 1, DEEP), /* C3: Not Connected */ PAD_NC(GPP_C3, NONE), /* C4: Not Connected */ diff --git a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c index 02f1db7..e64baa3 100644 --- a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c @@ -249,14 +249,14 @@ * End: GPP_H23 */ /* H00: M.2_PCH_SSD_RESET_N */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_H00, 1, PLTRST, NONE), + PAD_CFG_GPO(GPP_H00, 1, PLTRST), /* H01: FLASH RECOVERY * HIGH: ENABLED * LOW: DISABLED * WEAK INTERNAL PD 20K */ PAD_NC(GPP_H01, NONE), /* H02: WLAN_RST_N */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_H02, 1, PLTRST, NONE), + PAD_CFG_GPO(GPP_H02, 1, PLTRST), /* H03: */ PAD_NC(GPP_H03, NONE), /* H04: */ @@ -266,7 +266,7 @@ /* H06: */ PAD_NC(GPP_H06, NONE), /* H07: M.2_CPU_SSD_PWREN */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_H07, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_H07, 1, DEEP), /* H08: */ PAD_NC(GPP_H08, NONE), /* H09: */ @@ -432,9 +432,9 @@ /* B17: */ PAD_NC(GPP_B17, NONE), /* B18: BT_RF_KILL_N */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_B18, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_B18, 1, DEEP), /* B19: WIFI_RF_KILL_N */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_B19, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_B19, 1, DEEP), /* B20: */ PAD_NC(GPP_B20, NONE), /* B21: */ diff --git a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c index 5e3cd00..542aa32 100644 --- a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c @@ -63,7 +63,7 @@ /* A12: PCH M.2 SSD PEDET */ PAD_NC(GPP_A12, NONE), /* A13: BlueTooth RF Kill */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_A13, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_A13, 1, DEEP), /* A14: Test Point 45 */ PAD_NC(GPP_A14, NONE), /* A15: Test Point 52 */ @@ -224,7 +224,7 @@ /* D13: Wireless LAN Wake */ PAD_NC(GPP_D13, NONE), /* D14: CPU M.2 SSD Power Enable */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_D14, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_D14, 1, DEEP), /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: PCH M.2 SSD Power Enable */ @@ -243,9 +243,9 @@ /* E2: Not Connected */ PAD_NC(GPP_E2, NONE), /* E3: WiFi RF Kill */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_E3, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_E3, 1, DEEP), /* E4: Retimer Force Power */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_E4, 0, DEEP, NONE), + PAD_CFG_GPO(GPP_E4, 0, DEEP), /* 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_GPIO_DRIVER(GPP_F20, 1, PLTRST, NONE), + PAD_CFG_GPO(GPP_F20, 1, PLTRST), /* 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 f1350c5..2526f7f 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_GPIO_DRIVER(GPP_A11, 1, PLTRST, NONE), + PAD_CFG_GPO(GPP_A11, 1, PLTRST), /* 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_GPIO_DRIVER(GPP_A23, 0, DEEP, NONE), + PAD_CFG_GPO(GPP_A23, 0, DEEP),
/* 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_GPIO_DRIVER(GPP_D16, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_D16, 1, DEEP), /* 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 a69b210..bfd0674 100644 --- a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c +++ b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c @@ -72,7 +72,7 @@ /* A12: PCH M.2 SSD PEDET */ PAD_CFG_NF(GPP_A12, NONE, DEEP, NF1), /* A13: BlueTooth RF Kill */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_A13, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_A13, 1, DEEP), /* A14: Test Point 45 */ PAD_NC(GPP_A14, NONE), /* A15: Test Point 52 */ @@ -229,7 +229,7 @@ /* D13: Wireless LAN Wake */ PAD_NC(GPP_D13, NONE), /* D14: CPU M.2 SSD Power Enable */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_D14, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_D14, 1, DEEP), /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: PCH M.2 SSD Power Enable */ @@ -248,9 +248,9 @@ /* E2: Not Connected */ PAD_NC(GPP_E2, NONE), /* E3: WiFi RF Kill */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_E3, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_E3, 1, DEEP), /* E4: Retimer Force Power */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_E4, 0, DEEP, NONE), + PAD_CFG_GPO(GPP_E4, 0, DEEP), /* 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_GPIO_DRIVER(GPP_F20, 1, PLTRST, NONE), + PAD_CFG_GPO(GPP_F20, 1, PLTRST), /* 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_GPIO_DRIVER(GPP_H2, 1, PLTRST, NONE), + PAD_CFG_GPO(GPP_H2, 1, PLTRST), /* 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 edde160..f7a9737 100644 --- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c +++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c @@ -63,7 +63,7 @@ /* A12: Not Connected */ PAD_NC(GPP_A12, NONE), /* A13: BlueTooth RF Kill */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_A13, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_A13, 1, DEEP), /* A14: Camera Power Enable */ PAD_NC(GPP_A14, NONE), /* A15: Camera Reset */ @@ -227,7 +227,7 @@ /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: PCH M.2 SSD Power Enable */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_D16, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_D16, 1, DEEP), /* D17: Not used Fingerprint ID */ PAD_NC(GPP_D17, NONE), /* D18: Bluetooth Wake */ @@ -242,7 +242,7 @@ /* E2: Not Connected */ PAD_NC(GPP_E2, NONE), /* E3: WiFi RF Kill */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_E3, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_E3, 1, DEEP), /* E4: P Offset */ PAD_NC(GPP_E4, NONE), /* E5: P Out */ @@ -323,7 +323,7 @@ /* F16: Not Connected */ PAD_NC(GPP_F16, NONE), /* F17: Touch Panel Reset */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_F17, 1, PLTRST, NONE), + PAD_CFG_GPO(GPP_F17, 1, PLTRST), /* 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_GPIO_DRIVER(GPP_H0, 1, PLTRST, NONE), + PAD_CFG_GPO(GPP_H0, 1, PLTRST), /* H1: BFX Strap 2 Bit 3 Weak Internal PD 20K */ PAD_CFG_GPO(GPP_H1, 0, DEEP), /* H2: Wireless LAN Reset */ @@ -450,7 +450,7 @@ PAD_NC(GPP_R7, NONE),
/* BT_EN */ - PAD_CFG_GPO_GPIO_DRIVER(GPP_VGPIO_0, 1, DEEP, NONE), + PAD_CFG_GPO(GPP_VGPIO_0, 1, DEEP),
/* CNVi BT UART0 */ PAD_NC(GPP_VGPIO_6, NONE),
-
Sean Rhodes (Code Review)