Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/87103?usp=email )
Change subject: mb/starlabs/starbook/*: Tidy GPIO comments for the SSD ......................................................................
mb/starlabs/starbook/*: Tidy GPIO comments for the SSD
This is a non-functional change, and only makes the GPIOs easier to read.
Change-Id: Ifd24ca28d66e5e987129a44b6682efab9b64049b Signed-off-by: Sean Rhodes sean@starlabs.systems Reviewed-on: https://review.coreboot.org/c/coreboot/+/87103 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/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 M src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c 9 files changed, 41 insertions(+), 47 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 dbbd7da..c71a390 100644 --- a/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c +++ b/src/mainboard/starlabs/byte_adl/variants/mk_ii/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 */
+ /* SSD */ + PAD_CFG_NF(GPP_D5, NONE, DEEP, NF1), /* Clock Request 0 */ + PAD_CFG_GPO(GPP_H0, 1, PLTRST), /* Reset */ + PAD_CFG_GPO(GPP_D16, 1, DEEP), /* Enable */ + /* GPD2: LAN Wake */ PAD_NC(GPD2, NONE), /* GPD6: Sleep A */ @@ -203,8 +208,6 @@ PAD_NC(GPP_D3, NONE), /* D4: Not Connected */ PAD_NC(GPP_D4, NONE), - /* D5: Clock Request 0 PCH M.2 SSD */ - PAD_CFG_NF(GPP_D5, NONE, DEEP, NF1), /* D6: Clock Request 1 Wireless LAN */ PAD_NC(GPP_D6, NONE), /* D7: Clock Request 2 LAN 1 */ @@ -225,8 +228,6 @@ PAD_NC(GPP_D14, NONE), /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), - /* D16: PCH M.2 SSD Power Enable */ - PAD_CFG_GPO(GPP_D16, 1, DEEP), /* D17: Not Connected */ PAD_NC(GPP_D17, NONE), /* D18: Not Connected */ @@ -336,8 +337,6 @@ /* F23: Not Connected */ PAD_NC(GPP_F23, NONE),
- /* H0: PCH M.2 SSD Reset */ - 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 */ diff --git a/src/mainboard/starlabs/starbook/variants/adl/gpio.c b/src/mainboard/starlabs/starbook/variants/adl/gpio.c index 38aefd0e..4e067de 100644 --- a/src/mainboard/starlabs/starbook/variants/adl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/adl/gpio.c @@ -39,6 +39,11 @@ PAD_CFG_NF(GPP_H5, NONE, DEEP, NF1), /* Clock */ PAD_CFG_GPI_APIC_LOW(GPP_E12, NONE, PLTRST), /* Interrupt */
+ /* SSD */ + PAD_CFG_NF(GPP_D6, NONE, DEEP, NF1), /* Clock Request 1 */ + PAD_CFG_GPO(GPP_D16, 1, DEEP), /* Enable */ + PAD_CFG_GPO(GPP_H0, 1, PLTRST), /* Reset */ + /* GPD2: LAN Wake */ PAD_NC(GPD2, NONE), /* GPD6: Sleep A */ @@ -209,8 +214,6 @@ PAD_NC(GPP_D4, NONE), /* D5: Clock Request 0 */ PAD_NC(GPP_D5, NONE), - /* D6: Clock Request 1 PCH M.2 SSD */ - PAD_CFG_NF(GPP_D6, NONE, DEEP, NF1), /* D7: Clock Request 2 Wireless LAN */ PAD_CFG_NF(GPP_D7, NONE, DEEP, NF1), /* D8: Clock Request 3 LAN */ @@ -229,8 +232,6 @@ PAD_NC(GPP_D14, NONE), /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), - /* D16: PCH M.2 SSD Power Enable */ - PAD_CFG_GPO(GPP_D16, 1, DEEP), /* D17: Not used Fingerprint ID */ PAD_NC(GPP_D17, NONE), /* D18: Not Connected */ @@ -338,8 +339,6 @@ /* F23: Not Connected */ PAD_NC(GPP_F23, NONE),
- /* H0: PCH M.2 SSD Reset */ - 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 */ diff --git a/src/mainboard/starlabs/starbook/variants/cml/gpio.c b/src/mainboard/starlabs/starbook/variants/cml/gpio.c index 7958b40..18fdbe0 100644 --- a/src/mainboard/starlabs/starbook/variants/cml/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/cml/gpio.c @@ -39,6 +39,9 @@ PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1), /* Clock */ PAD_CFG_GPI_APIC_LOW(GPP_B3, NONE, PLTRST), /* Interrupt */
+ /* SSD */ + PAD_CFG_NF(GPP_B6, NONE, DEEP, NF1), /* Clock Request 1 */ + /* GPD2: LAN_WAKE# */ PAD_NC(GPD2, NONE), /* GPD6: SIO_SLP_A# */ @@ -111,8 +114,6 @@ PAD_CFG_GPO(GPP_B4, 1, DEEP), /* B5: WLAN_CLKREQ# */ PAD_CFG_NF(GPP_B5, NONE, DEEP, NF1), - /* B6: CLKREQ1_SSD_N */ - PAD_CFG_NF(GPP_B6, NONE, DEEP, NF1), /* B7: LAN_CLKREQ# */ PAD_CFG_NF(GPP_B7, NONE, DEEP, NF1), /* B8: Not Connected */ diff --git a/src/mainboard/starlabs/starbook/variants/kbl/gpio.c b/src/mainboard/starlabs/starbook/variants/kbl/gpio.c index d9a075b..957ca9a 100644 --- a/src/mainboard/starlabs/starbook/variants/kbl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/kbl/gpio.c @@ -30,6 +30,9 @@ PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1), /* Clock */ PAD_CFG_GPI_APIC_LOW(GPP_C23, NONE, PLTRST), /* Interrupt */
+ /* SSD */ + PAD_CFG_NF(GPP_B10, DN_20K, DEEP, NF1), /* Clock Request 5 */ + /* GPD2: Not Connected */ PAD_NC(GPD2, NONE), /* GPD6: Not Connected */ @@ -110,8 +113,6 @@ PAD_CFG_NF(GPP_B8, DN_20K, DEEP, NF1), /* GPP_B9: WLAN_CLKREQ# */ PAD_CFG_NF(GPP_B9, NONE, DEEP, NF1), - /* GPP_B10: CLKREQ5# */ - PAD_CFG_NF(GPP_B10, DN_20K, DEEP, NF1), /* GPP_B11: Not Connected */ PAD_NC(GPP_B11, DN_20K), /* GPP_B12 SLP_S0_N */ diff --git a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c index 468b4a7..3b15bb8 100644 --- a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c @@ -44,6 +44,11 @@ PAD_CFG_NF(GPP_H20, NONE, DEEP, NF1), /* Clock */ PAD_CFG_GPI_APIC(GPP_B00, NONE, DEEP, LEVEL, INVERT), /* Interrupt */
+ /* SSD */ + PAD_CFG_NF(GPP_D20, NONE, DEEP, NF1), /* Clock Request 8 */ + PAD_CFG_GPO(GPP_H00, 1, PLTRST), /* Reset */ + PAD_CFG_GPO(GPP_H07, 1, PLTRST), /* Enable */ + /* V02: PCIE_WAKE_LAN */ PAD_NC(GPP_V02, NONE), /* V06: GPD_6_SLP_A_N */ @@ -240,8 +245,6 @@ * Start: GPP_H00 * End: GPP_H23 */ - /* H00: M.2_PCH_SSD_RESET_N */ - PAD_CFG_GPO(GPP_H00, 1, PLTRST), /* H01: FLASH RECOVERY * HIGH: ENABLED * LOW: DISABLED @@ -257,8 +260,6 @@ PAD_NC(GPP_H05, NONE), /* H06: */ PAD_NC(GPP_H06, NONE), - /* H07: M.2_CPU_SSD_PWREN */ - PAD_CFG_GPO(GPP_H07, 1, DEEP), /* H10: */ PAD_NC(GPP_H10, NONE), /* H11: */ @@ -473,9 +474,6 @@ PAD_NC(GPP_D18, NONE), /* D19: */ PAD_NC(GPP_D19, NONE), - /* D20: CLKREQ8 - * SSD */ - PAD_CFG_NF(GPP_D20, NONE, DEEP, NF1), /* D21: CLKREQ5 * WLAN */ PAD_CFG_NF(GPP_D21, NONE, DEEP, NF2), diff --git a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c index 96e9797..309da16 100644 --- a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c @@ -39,6 +39,11 @@ PAD_CFG_NF(GPP_H5, NONE, DEEP, NF1), /* Clock */ PAD_CFG_GPI_APIC_LOW(GPP_E12, NONE, PLTRST), /* Interrupt */
+ /* SSD */ + PAD_CFG_NF(GPP_H19, NONE, DEEP, NF1), /* Clock Request 4 */ + PAD_CFG_GPO(GPP_F20, 1, PLTRST), /* Reset */ + PAD_CFG_GPO(GPP_D14, 1, DEEP), /* Enable */ + /* GPD2: LAN Wake */ PAD_NC(GPD2, NONE), /* GPD6: Sleep A */ @@ -226,8 +231,6 @@ PAD_NC(GPP_D12, NONE), /* D13: Wireless LAN Wake */ PAD_NC(GPP_D13, NONE), - /* D14: CPU M.2 SSD Power Enable */ - PAD_CFG_GPO(GPP_D14, 1, DEEP), /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: PCH M.2 SSD Power Enable */ @@ -330,8 +333,6 @@ PAD_NC(GPP_F18, NONE), /* F19: Not Connected */ PAD_NC(GPP_F19, NONE), - /* F20: CPU M.2 SSD Reset */ - PAD_CFG_GPO(GPP_F20, 1, PLTRST), /* F21: GPPC_F21 */ PAD_NC(GPP_F21, NONE), /* F22: Not Connected */ @@ -369,8 +370,6 @@ PAD_CFG_NF(GPP_H17, NONE, DEEP, NF1), /* H18: CPI C10 Gate */ PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1), - /* H19: Clock Request 4 CPU M.2 SSD */ - PAD_CFG_NF(GPP_H19, NONE, DEEP, NF1), /* H20: Not Connected */ PAD_NC(GPP_H20, NONE), /* H21: Not Connected */ diff --git a/src/mainboard/starlabs/starbook/variants/tgl/gpio.c b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c index f8e178d..ca081ff 100644 --- a/src/mainboard/starlabs/starbook/variants/tgl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c @@ -30,6 +30,11 @@ PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1), /* Clock */ PAD_CFG_GPI_APIC_LOW(GPP_C8, NONE, PLTRST), /* Interrupt */
+ /* SSD */ + PAD_NC(GPP_D8, NONE), /* Clock Request 3 */ + PAD_CFG_GPO(GPP_A11, 1, PLTRST), /* Reset */ + PAD_CFG_GPO(GPP_D16, 1, DEEP), /* Enable */ + /* GPD2: LAN_WAKE# */ PAD_NC(GPD2, NONE), /* GPD6: SIO_SLP_A# */ @@ -52,8 +57,6 @@ PAD_CFG_NF(GPP_A9, NONE, DEEP, NF2), /* A10: WLAN_PCM_IN */ PAD_NC(GPP_A10, NONE), - /* A11: M2_CPU_SSD_RST_N */ - PAD_CFG_GPO(GPP_A11, 1, PLTRST), /* A12: SATAGP_1 */ PAD_CFG_NF(GPP_A12, UP_20K, DEEP, NF1), /* A13: Not Connected */ @@ -183,8 +186,6 @@ PAD_NC(GPP_D6, NONE), /* D7: LAN_CLKREQ# */ PAD_NC(GPP_D7, NONE), - /* D8: Not Connected */ - PAD_NC(GPP_D8, NONE), /* D9: Not Connected */ PAD_NC(GPP_D9, NONE), /* D10: Not Connected */ @@ -199,8 +200,6 @@ PAD_NC(GPP_D14, NONE), /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), - /* D16: CPU_SSD_PWREN */ - 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 5cb167a..080f95d 100644 --- a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c +++ b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c @@ -49,6 +49,11 @@ PAD_CFG_NF(GPP_H5, NONE, DEEP, NF1), /* Clock */ PAD_CFG_GPI_APIC_LOW(GPP_D11, NONE, PLTRST), /* Interrupt */
+ /* SSD */ + PAD_CFG_NF(GPP_D6, NONE, DEEP, NF1), /* Clock Request 5 */ + PAD_CFG_GPO(GPP_F20, 1, PLTRST), /* Reset */ + PAD_CFG_GPO(GPP_D14, 1, DEEP), /* Enable */ + /* GPD2: LAN Wake */ PAD_NC(GPD2, NONE), /* GPD6: Sleep A */ @@ -215,8 +220,6 @@ PAD_NC(GPP_D4, NONE), /* D5: Clock Request 0 */ PAD_NC(GPP_D5, NONE), - /* D6: Clock Request 1 PCH M.2 SSD */ - PAD_CFG_NF(GPP_D6, NONE, DEEP, NF1), /* D7: Clock Request 2 Wireless LAN */ PAD_CFG_NF(GPP_D7, NONE, DEEP, NF1), /* D8: Clock Request 3 LAN */ @@ -229,8 +232,6 @@ PAD_NC(GPP_D12, NONE), /* D13: Wireless LAN Wake */ PAD_NC(GPP_D13, NONE), - /* D14: CPU M.2 SSD Power Enable */ - PAD_CFG_GPO(GPP_D14, 1, DEEP), /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), /* D16: PCH M.2 SSD Power Enable */ @@ -327,8 +328,6 @@ PAD_NC(GPP_F18, NONE), /* F19: Not Connected */ PAD_NC(GPP_F19, NONE), - /* F20: CPU M.2 SSD Reset */ - PAD_CFG_GPO(GPP_F20, 1, PLTRST), /* F21: GPPC_F21 */ PAD_NC(GPP_F21, NONE), /* F22: Not Connected */ 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 64e7b83..6a0db68 100644 --- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c +++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/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 */
+ /* SSD */ + PAD_CFG_NF(GPP_D5, NONE, DEEP, NF1), /* Clock Request 0 */ + PAD_CFG_GPO(GPP_H0, 1, PLTRST), /* Reset */ + PAD_CFG_GPO(GPP_D16, 1, DEEP), /* Enable */ + /* GPD2: LAN Wake */ PAD_NC(GPD2, NONE), /* GPD6: Sleep A */ @@ -201,8 +206,6 @@ PAD_NC(GPP_D3, NONE), /* D4: Camera Image Clock Output */ PAD_NC(GPP_D4, NONE), - /* D5: Clock Request 0 PCH M.2 SSD */ - PAD_CFG_NF(GPP_D5, NONE, DEEP, NF1), /* D6: Clock Request 1 Wireless LAN */ PAD_NC(GPP_D6, NONE), /* D7: Clock Request 2 */ @@ -223,8 +226,6 @@ PAD_NC(GPP_D14, NONE), /* D15: Not Connected */ PAD_NC(GPP_D15, NONE), - /* D16: PCH M.2 SSD Power Enable */ - PAD_CFG_GPO(GPP_D16, 1, DEEP), /* D17: Not used Fingerprint ID */ PAD_NC(GPP_D17, NONE), /* D18: Bluetooth Wake */ @@ -334,8 +335,6 @@ /* F23: Not Connected */ PAD_NC(GPP_F23, NONE),
- /* H0: PCH M.2 SSD Reset */ - 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 */
-
Sean Rhodes (Code Review)