Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/87100?usp=email )
Change subject: mb/starlabs/starbook/*: Tidy GPIO comments for deep GPIOs ......................................................................
mb/starlabs/starbook/*: Tidy GPIO comments for deep GPIOs
This is a non-functional change, and only makes the GPIOs easier to read.
Change-Id: Ic5c541a44ac9b34dad5430c994b1fa28e96d67f4 Signed-off-by: Sean Rhodes sean@starlabs.systems Reviewed-on: https://review.coreboot.org/c/coreboot/+/87100 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, 71 insertions(+), 115 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 d3fa51b..3814deb 100644 --- a/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c +++ b/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c @@ -17,24 +17,20 @@
/* Pad configuration in ramstage. */ const struct pad_config gpio_table[] = { - /* GPD0: Battery Low */ - PAD_CFG_NF(GPD0, NONE, DEEP, NF1), - /* GPD1: Charger Connected */ - PAD_CFG_NF(GPD1, NONE, DEEP, NF1), + /* General Purpose I/O Deep */ + PAD_CFG_NF(GPD0, NONE, DEEP, NF1), /* Battery Low */ + PAD_CFG_NF(GPD1, NONE, DEEP, NF1), /* Charger Connected */ + PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), /* Power Button */ + PAD_NC(GPD4, NONE), /* Sleep S3 */ + PAD_NC(GPD5, NONE), /* Sleep S4 */ + PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* Bluetooth Suspend */ + /* GPD2: LAN Wake */ PAD_NC(GPD2, NONE), - /* GPD3: Power Button */ - PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), - /* GPD4: Sleep S3 */ - PAD_NC(GPD4, NONE), - /* GPD5: Sleep S4 */ - PAD_NC(GPD5, NONE), /* GPD6: Sleep A */ PAD_NC(GPD6, NONE), /* GPD7: Power Adapter Disable */ PAD_CFG_GPO(GPD7, 0, PWROK), - /* GPD8: Suspend Clock */ - PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* GPD9: Wireless LAN Sleep */ PAD_NC(GPD9, NONE), /* GPD10: Sleep S5 */ diff --git a/src/mainboard/starlabs/starbook/variants/adl/gpio.c b/src/mainboard/starlabs/starbook/variants/adl/gpio.c index 493ec7b..619b315 100644 --- a/src/mainboard/starlabs/starbook/variants/adl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/adl/gpio.c @@ -17,24 +17,20 @@
/* Pad configuration in ramstage. */ const struct pad_config gpio_table[] = { - /* GPD0: Battery Low */ - PAD_CFG_NF(GPD0, NONE, DEEP, NF1), - /* GPD1: Charger Connected */ - PAD_CFG_NF(GPD1, NONE, DEEP, NF1), + /* General Purpose I/O Deep */ + PAD_CFG_NF(GPD0, NONE, DEEP, NF1), /* Battery Low */ + PAD_CFG_NF(GPD1, NONE, DEEP, NF1), /* Charger Connected */ + PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), /* Power Button */ + PAD_NC(GPD4, NONE), /* Sleep S3 */ + PAD_NC(GPD5, NONE), /* Sleep S4 */ + PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* Bluetooth Suspend */ + /* GPD2: LAN Wake */ PAD_NC(GPD2, NONE), - /* GPD3: Power Button */ - PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), - /* GPD4: Sleep S3 */ - PAD_NC(GPD4, NONE), - /* GPD5: Sleep S4 */ - PAD_NC(GPD5, NONE), /* GPD6: Sleep A */ PAD_NC(GPD6, NONE), /* GPD7: Power Adapter Disable */ PAD_CFG_GPO(GPD7, 0, PWROK), - /* GPD8: Suspend Clock */ - PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* GPD9: Wireless LAN Sleep */ PAD_NC(GPD9, NONE), /* GPD10: Sleep S5 */ diff --git a/src/mainboard/starlabs/starbook/variants/cml/gpio.c b/src/mainboard/starlabs/starbook/variants/cml/gpio.c index acdeeb4..da73483 100644 --- a/src/mainboard/starlabs/starbook/variants/cml/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/cml/gpio.c @@ -26,26 +26,20 @@
/* Pad configuration in ramstage. */ const struct pad_config gpio_table[] = { - /* REFERENCE: EP PER SCHEMATIC */ + /* General Purpose I/O Deep */ + PAD_CFG_NF(GPD0, NONE, DEEP, NF1), /* Battery Low */ + PAD_CFG_NF(GPD1, NONE, DEEP, NF1), /* Charger Connected */ + PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), /* Power Button */ + PAD_CFG_NF(GPD4, NONE, DEEP, NF1), /* Sleep S3 */ + PAD_CFG_NF(GPD5, NONE, DEEP, NF1), /* Sleep S4 */ + PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* Bluetooth Suspend */
- /* GPD0: PCH_BATLOW# */ - PAD_CFG_NF(GPD0, NONE, DEEP, NF1), - /* GPD1: AC_PRESENT */ - PAD_CFG_NF(GPD1, NONE, DEEP, NF1), /* GPD2: LAN_WAKE# */ PAD_NC(GPD2, NONE), - /* GPD3: SIO_PWRBTN# */ - PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), - /* GPD4: SIO_SLP_S3# */ - PAD_CFG_NF(GPD4, NONE, DEEP, NF1), - /* GPD5: SIO_SLP_S4# */ - PAD_CFG_NF(GPD5, NONE, DEEP, NF1), /* GPD6: SIO_SLP_A# */ PAD_CFG_NF(GPD6, NONE, DEEP, NF1), /* GPD7: PCH_TBT_PERST# */ PAD_CFG_GPO(GPD7, 0, PLTRST), - /* GPD8: SUSCLK */ - PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* GPD9: SIO_SLP_WLAN# */ PAD_CFG_NF(GPD9, NONE, DEEP, NF1), /* GPD10: SIO_SLP_S5# */ diff --git a/src/mainboard/starlabs/starbook/variants/kbl/gpio.c b/src/mainboard/starlabs/starbook/variants/kbl/gpio.c index 71fc2dc..6cffc5f 100644 --- a/src/mainboard/starlabs/starbook/variants/kbl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/kbl/gpio.c @@ -17,24 +17,20 @@
/* Pad configuration in ramstage. */ const struct pad_config gpio_table[] = { - /* GPD0: PM_BATLOW_N */ - PAD_CFG_NF(GPD0, UP_20K, PWROK, NF1), - /* GPD1: AC_PRESENT */ - PAD_CFG_NF(GPD1, NATIVE, PWROK, NF1), + /* General Purpose I/O Deep */ + PAD_CFG_NF(GPD0, UP_20K, PWROK, NF1), /* Battery Low */ + PAD_CFG_NF(GPD1, NATIVE, PWROK, NF1), /* Charger Connected */ + PAD_CFG_NF(GPD3, UP_20K, PWROK, NF1), /* Power Button */ + PAD_CFG_NF(GPD4, NONE, PWROK, NF1), /* Sleep S3 */ + PAD_CFG_NF(GPD5, NONE, PWROK, NF1), /* Sleep S4 */ + PAD_CFG_NF(GPD8, NONE, PWROK, NF1), /* Bluetooth Suspend */ + /* GPD2: Not Connected */ PAD_NC(GPD2, NONE), - /* GPD3: SOC_PWRBTN_N */ - PAD_CFG_NF(GPD3, UP_20K, PWROK, NF1), - /* GPD4: SLP_S3_N */ - PAD_CFG_NF(GPD4, NONE, PWROK, NF1), - /* GPD5: SLP_S4_N */ - PAD_CFG_NF(GPD5, NONE, PWROK, NF1), /* GPD6: Not Connected */ PAD_NC(GPD6, NONE), /* GPD7: Not Connected */ PAD_NC(GPD7, NONE), - /* GPD8: SUS_CLK */ - PAD_CFG_NF(GPD8, NONE, PWROK, NF1), /* GPD9: Not Connected */ PAD_NC(GPD9, NONE), /* GPD10: Not Connected */ diff --git a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c index e7f66ff..c3b4c6d 100644 --- a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c @@ -22,29 +22,20 @@
/* Pad configuration in ramstage. */ const struct pad_config gpio_table[] = { - /* - * GPP_V - * Start: GPP_V00 - * End: GPP_V22 - */ - /* V00: PM_BATLOW_N */ - PAD_CFG_NF(GPP_V00, NONE, DEEP, NF1), - /* V01: CHG_ACOK */ - PAD_CFG_NF(GPP_V01, NONE, DEEP, NF1), + /* General Purpose I/O Deep */ + PAD_CFG_NF(GPP_V00, NONE, DEEP, NF1), /* Battery Low */ + PAD_CFG_NF(GPP_V01, NONE, DEEP, NF1), /* Charger Connected */ + PAD_CFG_NF(GPP_V03, UP_20K, DEEP, NF1), /* Power Button */ + PAD_CFG_NF(GPP_V04, NONE, DEEP, NF1), /* Sleep S3 */ + PAD_CFG_NF(GPP_V05, NONE, DEEP, NF1), /* Sleep S4 */ + PAD_CFG_NF(GPP_V08, NONE, DEEP, NF1), /* Bluetooth Suspend */ + /* V02: PCIE_WAKE_LAN */ PAD_NC(GPP_V02, NONE), - /* V03: EC_PWRBTN_N */ - PAD_CFG_NF(GPP_V03, UP_20K, DEEP, NF1), - /* V04: PM_SLP_S3_N */ - PAD_CFG_NF(GPP_V04, NONE, DEEP, NF1), - /* V05: SLP S4# */ - PAD_CFG_NF(GPP_V05, NONE, DEEP, NF1), /* V06: GPD_6_SLP_A_N */ PAD_NC(GPP_V06, NONE), /* V07: */ PAD_NC(GPP_V07, NONE), - /* V08: M.2_BTWIFI_SUS_CLK */ - PAD_CFG_NF(GPP_V08, NONE, DEEP, NF1), /* V09: GPD_9_SLP_WLAN_N */ PAD_NC(GPP_V09, NONE), /* V10: PM_SLP_S5_N */ diff --git a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c index bae3564..1aeb866 100644 --- a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c @@ -17,26 +17,23 @@
/* Pad configuration in ramstage. */ const struct pad_config gpio_table[] = { - /* GPD0: Battery Low */ - PAD_CFG_NF(GPD0, NONE, DEEP, NF1), - /* GPD1: Charger Connected */ - PAD_CFG_NF(GPD1, NONE, DEEP, NF1), + /* General Purpose I/O Deep */ + PAD_CFG_NF(GPD0, NONE, DEEP, NF1), /* Battery Low */ + PAD_CFG_NF(GPD1, NONE, DEEP, NF1), /* Charger Connected */ + PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), /* Power Button */ + PAD_NC(GPD4, NONE), /* Sleep S3 */ + PAD_NC(GPD5, NONE), /* Sleep S4 */ + PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* Bluetooth Suspend */ + /* GPD2: LAN Wake */ PAD_NC(GPD2, NONE), - /* GPD3: Power Button */ - PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), - /* GPD4: Sleep S3 */ - PAD_NC(GPD4, NONE), - /* GPD5: Sleep S4 */ - PAD_NC(GPD5, NONE), /* GPD6: Sleep A */ PAD_NC(GPD6, NONE), /* GPD7: Power Adapter Disable */ PAD_CFG_GPO(GPD7, 0, PWROK), - /* GPD8: Suspend Clock */ - PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* GPD9: Wireless LAN Sleep */ PAD_CFG_NF(GPD9, NONE, DEEP, NF1), + /* GPD10: Sleep S5 */ PAD_NC(GPD10, NONE), /* GPD11: LAN PHY Enable */ diff --git a/src/mainboard/starlabs/starbook/variants/tgl/gpio.c b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c index 2a0a538..08e2563 100644 --- a/src/mainboard/starlabs/starbook/variants/tgl/gpio.c +++ b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c @@ -17,26 +17,20 @@
/* Pad configuration in ramstage. */ const struct pad_config gpio_table[] = { - /* REFERENCE: EP PER SCHEMATIC */ + /* General Purpose I/O Deep */ + PAD_CFG_NF(GPD0, NONE, DEEP, NF1), /* Battery Low */ + PAD_CFG_NF(GPD1, NONE, DEEP, NF1), /* Charger Connected */ + PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), /* Power Button */ + PAD_CFG_NF(GPD4, NONE, DEEP, NF1), /* Sleep S3 */ + PAD_CFG_NF(GPD5, NONE, DEEP, NF1), /* Sleep S4 */ + PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* Bluetooth Suspend */
- /* GPD0: PCH_BATLOW# */ - PAD_CFG_NF(GPD0, NONE, DEEP, NF1), - /* GPD1: AC_PRESENT */ - PAD_CFG_NF(GPD1, NONE, DEEP, NF1), /* GPD2: LAN_WAKE# */ PAD_NC(GPD2, NONE), - /* GPD3: SIO_PWRBTN# */ - PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), - /* GPD4: SIO_SLP_S3# */ - PAD_CFG_NF(GPD4, NONE, DEEP, NF1), - /* GPD5: SIO_SLP_S4# */ - PAD_CFG_NF(GPD5, NONE, DEEP, NF1), /* GPD6: SIO_SLP_A# */ PAD_CFG_NF(GPD6, NONE, DEEP, NF1), /* GPD7: PCH_TBT_PERST# */ PAD_CFG_GPO(GPD7, 0, PLTRST), - /* GPD8: SUSCLK */ - PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* GPD9: SIO_SLP_WLAN# */ PAD_CFG_NF(GPD9, NONE, DEEP, NF1), /* GPD10: SIO_SLP_S5# */ diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c index 6890c27..3ffa198 100644 --- a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c +++ b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c @@ -27,24 +27,20 @@
/* Pad configuration in ramstage. */ const struct pad_config gpio_table[] = { - /* GPD0: Battery Low */ - PAD_CFG_NF(GPD0, NONE, DEEP, NF1), - /* GPD1: Charger Connected */ - PAD_CFG_NF(GPD1, NONE, DEEP, NF1), + /* General Purpose I/O Deep */ + PAD_CFG_NF(GPD0, NONE, DEEP, NF1), /* Battery Low */ + PAD_CFG_NF(GPD1, NONE, DEEP, NF1), /* Charger Connected */ + PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), /* Power Button */ + PAD_NC(GPD4, NONE), /* Sleep S3 */ + PAD_NC(GPD5, NONE), /* Sleep S4 */ + PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* Bluetooth Suspend */ + /* GPD2: LAN Wake */ PAD_NC(GPD2, NONE), - /* GPD3: Power Button */ - PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), - /* GPD4: Sleep S3 */ - PAD_NC(GPD4, NONE), - /* GPD5: Sleep S4 */ - PAD_NC(GPD5, NONE), /* GPD6: Sleep A */ PAD_NC(GPD6, NONE), /* GPD7: Power Adapter Disable */ PAD_CFG_GPO(GPD7, 0, PWROK), - /* GPD8: Suspend Clock */ - PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* GPD9: Wireless LAN Sleep */ PAD_CFG_NF(GPD9, NONE, DEEP, NF1), /* GPD10: Sleep S5 */ 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 8dea7a5..4e96453 100644 --- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c +++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c @@ -17,24 +17,20 @@
/* Pad configuration in ramstage. */ const struct pad_config gpio_table[] = { - /* GPD0: Battery Low */ - PAD_CFG_NF(GPD0, NONE, DEEP, NF1), - /* GPD1: Charger Connected */ - PAD_CFG_NF(GPD1, NONE, DEEP, NF1), + /* General Purpose I/O Deep */ + PAD_CFG_NF(GPD0, NONE, DEEP, NF1), /* Battery Low */ + PAD_CFG_NF(GPD1, NONE, DEEP, NF1), /* Charger Connected */ + PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), /* Power Button */ + PAD_NC(GPD4, NONE), /* Sleep S3 */ + PAD_NC(GPD5, NONE), /* Sleep S4 */ + PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* Bluetooth Suspend */ + /* GPD2: LAN Wake */ PAD_NC(GPD2, NONE), - /* GPD3: Power Button */ - PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), - /* GPD4: Sleep S3 */ - PAD_NC(GPD4, NONE), - /* GPD5: Sleep S4 */ - PAD_NC(GPD5, NONE), /* GPD6: Sleep A */ PAD_NC(GPD6, NONE), /* GPD7: Power Adapter Disable */ PAD_CFG_GPO(GPD7, 0, PWROK), - /* GPD8: Suspend Clock */ - PAD_CFG_NF(GPD8, NONE, DEEP, NF1), /* GPD9: Wireless LAN Sleep */ PAD_NC(GPD9, NONE), /* GPD10: Sleep S5 */
-
Sean Rhodes (Code Review)