gpio: Reformat gpio.inc files to use longer than 80-column lines

These files are tabular data more than source code.  We discussed
and concluded that the 80-column limit makes them harder to read,
not easier.  This commit reformats them to take advantage of
longer lines, mainly by putting per GPIO comments on the end of
the line that defines the GPIO.

Signed-off-by: Anton Staaf <robotboy@chromium.org>

BRANCH=none
TEST=make buildall -j

Change-Id: I60f3e3620680196eb9462f97b34c453289240465
Reviewed-on: https://chromium-review.googlesource.com/205672
Tested-by: Anton Staaf <robotboy@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Commit-Queue: Anton Staaf <robotboy@chromium.org>

11 files changed, 387 insertions, 751 deletions

diff --git a/board/falco/gpio.inc b/board/falco/gpio.inc
index 9d405d6f12..f4e714a5da 100644
--- a/board/falco/gpio.inc
+++ b/board/falco/gpio.inc
@@ -6,143 +6,83 @@
  */
 
 /* Inputs with interrupt handlers are first for efficiency */
-/* Power button */
-GPIO(POWER_BUTTON_L, A, 2, GPIO_INT_BOTH_DSLEEP, power_button_interrupt)
-/* Lid switch */
-GPIO(LID_OPEN,       A, 3, GPIO_INT_BOTH_DSLEEP, lid_interrupt)
-/* AC power present */
-GPIO(AC_PRESENT,     H, 3, GPIO_INT_BOTH_DSLEEP, extpower_interrupt)
-/* Backlight enable signal from PCH */
-GPIO(PCH_BKLTEN,     M, 3, GPIO_INT_BOTH,        backlight_interrupt)
-/* SLP_S0# signal from PCH */
-GPIO(PCH_SLP_S0_L,   G, 6, GPIO_INT_BOTH,        power_signal_interrupt)
-/* SLP_S3# signal from PCH */
-GPIO(PCH_SLP_S3_L,   G, 7, GPIO_INT_BOTH_DSLEEP, power_signal_interrupt)
-/* SLP_S5# signal from PCH */
-GPIO(PCH_SLP_S5_L,   H, 1, GPIO_INT_BOTH_DSLEEP, power_signal_interrupt)
-/* SLP_SUS# signal from PCH */
-GPIO(PCH_SLP_SUS_L,  G, 3, GPIO_INT_BOTH,	 power_signal_interrupt)
-/* Power good on 1.05V */
-GPIO(PP1050_PGOOD,   H, 4, GPIO_INT_BOTH,	 power_signal_interrupt)
-/* Power good on 1.35V (DRAM) */
-GPIO(PP1350_PGOOD,   H, 6, GPIO_INT_BOTH,	 power_signal_interrupt)
-/* Power good on 5V */
-GPIO(PP5000_PGOOD,   N, 0, GPIO_INT_BOTH,        power_signal_interrupt)
-/* Power good on core VR */
-GPIO(VCORE_PGOOD,    C, 6, GPIO_INT_BOTH,	 power_signal_interrupt)
-/* PCH wants EDP enabled */
-GPIO(PCH_EDP_VDD_EN, J, 1, GPIO_INT_BOTH,        lcdvcc_interrupt)
-/* Recovery signal from servo */
-GPIO(RECOVERY_L,     A, 5, GPIO_PULL_UP | GPIO_INT_BOTH, switch_interrupt)
-/* Write protect input */
-GPIO(WP_L,           A, 4, GPIO_INT_BOTH,	 switch_interrupt)
-/* JTAG clock input */
-GPIO(JTAG_TCK,       C, 0, GPIO_DEFAULT,	 jtag_interrupt)
-/* UART0 RX input */
-GPIO(UART0_RX,       A, 0, GPIO_PULL_UP | GPIO_INT_BOTH_DSLEEP,
-     uart_deepsleep_interrupt)
+GPIO(POWER_BUTTON_L, A, 2, GPIO_INT_BOTH_DSLEEP,                power_button_interrupt)   /* Power button */
+GPIO(LID_OPEN,       A, 3, GPIO_INT_BOTH_DSLEEP,                lid_interrupt)            /* Lid switch */
+GPIO(AC_PRESENT,     H, 3, GPIO_INT_BOTH_DSLEEP,                extpower_interrupt)       /* AC power present */
+GPIO(PCH_BKLTEN,     M, 3, GPIO_INT_BOTH,                       backlight_interrupt)      /* Backlight enable signal from PCH */
+GPIO(PCH_SLP_S0_L,   G, 6, GPIO_INT_BOTH,                       power_signal_interrupt)   /* SLP_S0# signal from PCH */
+GPIO(PCH_SLP_S3_L,   G, 7, GPIO_INT_BOTH_DSLEEP,                power_signal_interrupt)   /* SLP_S3# signal from PCH */
+GPIO(PCH_SLP_S5_L,   H, 1, GPIO_INT_BOTH_DSLEEP,                power_signal_interrupt)   /* SLP_S5# signal from PCH */
+GPIO(PCH_SLP_SUS_L,  G, 3, GPIO_INT_BOTH,	                power_signal_interrupt)   /* SLP_SUS# signal from PCH */
+GPIO(PP1050_PGOOD,   H, 4, GPIO_INT_BOTH,	                power_signal_interrupt)   /* Power good on 1.05V */
+GPIO(PP1350_PGOOD,   H, 6, GPIO_INT_BOTH,	                power_signal_interrupt)   /* Power good on 1.35V (DRAM) */
+GPIO(PP5000_PGOOD,   N, 0, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on 5V */
+GPIO(VCORE_PGOOD,    C, 6, GPIO_INT_BOTH,	                power_signal_interrupt)   /* Power good on core VR */
+GPIO(PCH_EDP_VDD_EN, J, 1, GPIO_INT_BOTH,                       lcdvcc_interrupt)         /* PCH wants EDP enabled */
+GPIO(RECOVERY_L,     A, 5, GPIO_PULL_UP | GPIO_INT_BOTH,        switch_interrupt)         /* Recovery signal from servo */
+GPIO(WP_L,           A, 4, GPIO_INT_BOTH,	                switch_interrupt)         /* Write protect input */
+GPIO(JTAG_TCK,       C, 0, GPIO_DEFAULT,	                jtag_interrupt)           /* JTAG clock input */
+GPIO(UART0_RX,       A, 0, GPIO_PULL_UP | GPIO_INT_BOTH_DSLEEP, uart_deepsleep_interrupt) /* UART0 RX input */
 
 /* Other inputs */
-/* From thermal sensor */
-GPIO(FAN_ALERT_L,          B, 0, GPIO_INPUT,    NULL)
-/* SUSWARN# signal from PCH */
-GPIO(PCH_SUSWARN_L,        G, 2, GPIO_INT_BOTH, NULL)
-/* USB port overcurrent warning */
-GPIO(USB1_OC_L,            E, 7, GPIO_INPUT,    NULL)
-/* USB port overcurrent warning */
-GPIO(USB2_OC_L,            E, 0, GPIO_INPUT,    NULL)
-/* Board version stuffing resistor 1 */
-GPIO(BOARD_VERSION1,       Q, 5, GPIO_INPUT,    NULL)
-/* Board version stuffing resistor 2 */
-GPIO(BOARD_VERSION2,       Q, 6, GPIO_INPUT,    NULL)
-/* Board version stuffing resistor 3 */
-GPIO(BOARD_VERSION3,       Q, 7, GPIO_INPUT,    NULL)
-/* Power good to the CPU */
-GPIO(CPU_PGOOD,            C, 4, GPIO_INPUT,    NULL)
+GPIO(FAN_ALERT_L,          B, 0, GPIO_INPUT,    NULL) /* From thermal sensor */
+GPIO(PCH_SUSWARN_L,        G, 2, GPIO_INT_BOTH, NULL) /* SUSWARN# signal from PCH */
+GPIO(USB1_OC_L,            E, 7, GPIO_INPUT,    NULL) /* USB port overcurrent warning */
+GPIO(USB2_OC_L,            E, 0, GPIO_INPUT,    NULL) /* USB port overcurrent warning */
+GPIO(BOARD_VERSION1,       Q, 5, GPIO_INPUT,    NULL) /* Board version stuffing resistor 1 */
+GPIO(BOARD_VERSION2,       Q, 6, GPIO_INPUT,    NULL) /* Board version stuffing resistor 2 */
+GPIO(BOARD_VERSION3,       Q, 7, GPIO_INPUT,    NULL) /* Board version stuffing resistor 3 */
+GPIO(CPU_PGOOD,            C, 4, GPIO_INPUT,    NULL) /* Power good to the CPU */
 
 /* Outputs; all unasserted by default except for reset signals */
-/* Force CPU to think it's overheated */
-GPIO(CPU_PROCHOT,          B, 1, GPIO_OUT_LOW, NULL)
-/* Enable 1.35V supply */
-GPIO(PP1350_EN,            H, 5, GPIO_OUT_LOW, NULL)
-/* Enable DSW rails */
-GPIO(PP3300_DSW_GATED_EN,  J, 3, GPIO_OUT_LOW, NULL)
-/* Enable power to lots of peripherals */
-GPIO(PP3300_DX_EN,         J, 2, GPIO_OUT_LOW, NULL)
-/* Enable LTE radio */
-GPIO(PP3300_LTE_EN,        D, 2, GPIO_OUT_LOW, NULL)
-/* Enable WiFi power */
-GPIO(PP3300_WLAN_EN,       J, 0, GPIO_OUT_LOW, NULL)
-/* Enable 1.05V regulator */
-GPIO(SUSP_VR_EN,           C, 7, GPIO_OUT_LOW, NULL)
-/* Stuffing option - not connected */
-GPIO(VCORE_EN,             C, 5, GPIO_OUT_LOW, NULL)
-/* Enable 5V supply */
-GPIO(PP5000_EN,            H, 7, GPIO_OUT_LOW, NULL)
-/* EC thinks everything is up and ready */
-GPIO(SYS_PWROK,            H, 2, GPIO_OUT_LOW, NULL)
-/* Disable WiFi radio */
-GPIO(WLAN_OFF_L,           J, 4, GPIO_OUT_LOW, NULL)
-/* Allow battery to charge when on AC */
-GPIO(CHARGE_L,             E, 6, GPIO_OUT_LOW, NULL)
+GPIO(CPU_PROCHOT,          B, 1, GPIO_OUT_LOW, NULL) /* Force CPU to think it's overheated */
+GPIO(PP1350_EN,            H, 5, GPIO_OUT_LOW, NULL) /* Enable 1.35V supply */
+GPIO(PP3300_DSW_GATED_EN,  J, 3, GPIO_OUT_LOW, NULL) /* Enable DSW rails */
+GPIO(PP3300_DX_EN,         J, 2, GPIO_OUT_LOW, NULL) /* Enable power to lots of peripherals */
+GPIO(PP3300_LTE_EN,        D, 2, GPIO_OUT_LOW, NULL) /* Enable LTE radio */
+GPIO(PP3300_WLAN_EN,       J, 0, GPIO_OUT_LOW, NULL) /* Enable WiFi power */
+GPIO(SUSP_VR_EN,           C, 7, GPIO_OUT_LOW, NULL) /* Enable 1.05V regulator */
+GPIO(VCORE_EN,             C, 5, GPIO_OUT_LOW, NULL) /* Stuffing option - not connected */
+GPIO(PP5000_EN,            H, 7, GPIO_OUT_LOW, NULL) /* Enable 5V supply */
+GPIO(SYS_PWROK,            H, 2, GPIO_OUT_LOW, NULL) /* EC thinks everything is up and ready */
+GPIO(WLAN_OFF_L,           J, 4, GPIO_OUT_LOW, NULL) /* Disable WiFi radio */
+GPIO(CHARGE_L,             E, 6, GPIO_OUT_LOW, NULL) /* Allow battery to charge when on AC */
+
+GPIO(ENABLE_BACKLIGHT,     M, 7, GPIO_OUT_LOW, NULL) /* Enable backlight power */
+GPIO(ENABLE_TOUCHPAD,      N, 1, GPIO_OUT_LOW, NULL) /* Enable touchpad power */
+GPIO(ENTERING_RW,          D, 3, GPIO_OUT_LOW, NULL) /* Indicate when EC is entering RW code */
+GPIO(PCH_DPWROK,           G, 0, GPIO_OUT_LOW, NULL) /* Indicate when VccDSW is good */
 
-/* Enable backlight power */
-GPIO(ENABLE_BACKLIGHT,     M, 7, GPIO_OUT_LOW, NULL)
-/* Enable touchpad power */
-GPIO(ENABLE_TOUCHPAD,      N, 1, GPIO_OUT_LOW, NULL)
-/* Indicate when EC is entering RW code */
-GPIO(ENTERING_RW,          D, 3, GPIO_OUT_LOW, NULL)
-/* Indicate when VccDSW is good */
-GPIO(PCH_DPWROK,           G, 0, GPIO_OUT_LOW, NULL)
 /*
  * HDA_SDO is technically an output, but we need to leave it as an
  * input until we drive it high.  So can't use open-drain (HI_Z).
  */
-/* HDA_SDO signal to PCH; when high, ME ignores security descriptor */
-GPIO(PCH_HDA_SDO,          G, 1, GPIO_INPUT,    NULL)
-/* Wake signal from EC to PCH */
-GPIO(PCH_WAKE_L,           F, 0, GPIO_OUT_HIGH, NULL)
-/* Non-maskable interrupt pin to PCH */
-GPIO(PCH_NMI_L,            F, 2, GPIO_OUT_HIGH, NULL)
-/* Power button output to PCH */
-GPIO(PCH_PWRBTN_L,         H, 0, GPIO_OUT_HIGH, NULL)
-/* PWROK / APWROK signals to PCH */
-GPIO(PCH_PWROK,            F, 5, GPIO_OUT_LOW,  NULL)
+GPIO(PCH_HDA_SDO,          G, 1, GPIO_INPUT,    NULL) /* HDA_SDO signal to PCH; when high, ME ignores security descriptor */
+GPIO(PCH_WAKE_L,           F, 0, GPIO_OUT_HIGH, NULL) /* Wake signal from EC to PCH */
+GPIO(PCH_NMI_L,            F, 2, GPIO_OUT_HIGH, NULL) /* Non-maskable interrupt pin to PCH */
+GPIO(PCH_PWRBTN_L,         H, 0, GPIO_OUT_HIGH, NULL) /* Power button output to PCH */
+GPIO(PCH_PWROK,            F, 5, GPIO_OUT_LOW,  NULL) /* PWROK / APWROK signals to PCH */
+
 /*
  * PL6 is one of 4 pins on the EC which can't be used in open-drain
  * mode.  To work around this PCH_RCIN_L is set to an input. It will
  * only be set to an output when it needs to be driven to 0.
  */
-/* RCIN# line to PCH (for 8042 emulation) */
-GPIO(PCH_RCIN_L,           L, 6, GPIO_INPUT,    NULL)
-/* Reset PCH resume power plane logic */
-GPIO(PCH_RSMRST_L,         F, 1, GPIO_OUT_LOW,  NULL)
-/* System management interrupt to PCH */
-GPIO(PCH_SMI_L,            F, 4, GPIO_ODR_HIGH, NULL)
-/* Reset touch screen */
-GPIO(TOUCHSCREEN_RESET_L,  N, 7, GPIO_OUT_LOW,  NULL)
-/* Enable EDP (passthru from PCH) */
-GPIO(EC_EDP_VDD_EN,        J, 5, GPIO_OUT_LOW,  NULL)
+GPIO(PCH_RCIN_L,           L, 6, GPIO_INPUT,    NULL) /* RCIN# line to PCH (for 8042 emulation) */
+GPIO(PCH_RSMRST_L,         F, 1, GPIO_OUT_LOW,  NULL) /* Reset PCH resume power plane logic */
+GPIO(PCH_SMI_L,            F, 4, GPIO_ODR_HIGH, NULL) /* System management interrupt to PCH */
+GPIO(TOUCHSCREEN_RESET_L,  N, 7, GPIO_OUT_LOW,  NULL) /* Reset touch screen */
+GPIO(EC_EDP_VDD_EN,        J, 5, GPIO_OUT_LOW,  NULL) /* Enable EDP (passthru from PCH) */
 
-/* Dunno. Probably important, though. */
-GPIO(LPC_CLKRUN_L,         M, 2, GPIO_ODR_HIGH, NULL)
-/* USB port 1 output power enable */
-GPIO(USB1_ENABLE,          E, 4, GPIO_OUT_LOW,  NULL)
-/* USB port 2 output power enable */
-GPIO(USB2_ENABLE,          D, 5, GPIO_OUT_LOW,  NULL)
+GPIO(LPC_CLKRUN_L,         M, 2, GPIO_ODR_HIGH, NULL) /* Dunno. Probably important, though. */
+GPIO(USB1_ENABLE,          E, 4, GPIO_OUT_LOW,  NULL) /* USB port 1 output power enable */
+GPIO(USB2_ENABLE,          D, 5, GPIO_OUT_LOW,  NULL) /* USB port 2 output power enable */
 
-/* Acknowledge PCH SUSWARN# signal */
-GPIO(PCH_SUSACK_L,         F, 3, GPIO_OUT_HIGH, NULL)
-/* Not supposed to be here */
-GPIO(PCH_RTCRST_L,         F, 6, GPIO_ODR_HIGH, NULL)
-/* Not supposed to be here */
-GPIO(PCH_SRTCRST_L,        F, 7, GPIO_ODR_HIGH, NULL)
+GPIO(PCH_SUSACK_L,         F, 3, GPIO_OUT_HIGH, NULL) /* Acknowledge PCH SUSWARN# signal */
+GPIO(PCH_RTCRST_L,         F, 6, GPIO_ODR_HIGH, NULL) /* Not supposed to be here */
+GPIO(PCH_SRTCRST_L,        F, 7, GPIO_ODR_HIGH, NULL) /* Not supposed to be here */
 
-/* Power LED */
-GPIO(PWR_LED_L,            N, 6, GPIO_OUT_HIGH, NULL)
-/* Keyboard LED */
-GPIO(KB_LED_EN,            D, 4, GPIO_OUT_LOW,  NULL)
-/* Battery charger status */
-GPIO(BAT_LED0,             D, 0, GPIO_OUT_LOW,  NULL)
-/* Battery charger status */
-GPIO(BAT_LED1,             D, 1, GPIO_OUT_LOW,  NULL)
+GPIO(PWR_LED_L,            N, 6, GPIO_OUT_HIGH, NULL) /* Power LED */
+GPIO(KB_LED_EN,            D, 4, GPIO_OUT_LOW,  NULL) /* Keyboard LED */
+GPIO(BAT_LED0,             D, 0, GPIO_OUT_LOW,  NULL) /* Battery charger status */
+GPIO(BAT_LED1,             D, 1, GPIO_OUT_LOW,  NULL) /* Battery charger status */
diff --git a/board/fruitpie/gpio.inc b/board/fruitpie/gpio.inc
index cc3b7e3fe0..ff41c5f212 100644
--- a/board/fruitpie/gpio.inc
+++ b/board/fruitpie/gpio.inc
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-GPIO(VBUS_WAKE,         B, 5,  GPIO_INT_BOTH, vbus_event)
+GPIO(VBUS_WAKE,         B, 5,  GPIO_INT_BOTH,    vbus_event)
 GPIO(MASTER_I2C_INT_L,  C, 13, GPIO_INT_FALLING, tsu_event)
 
 /* PD RX/TX */
diff --git a/board/link/gpio.inc b/board/link/gpio.inc
index 315b17db85..30d5116110 100644
--- a/board/link/gpio.inc
+++ b/board/link/gpio.inc
@@ -6,141 +6,77 @@
  */
 
 /* Inputs with interrupt handlers are first for efficiency */
-/* Power button */
-GPIO(POWER_BUTTON_L,       K, 7, GPIO_INT_BOTH, power_button_interrupt)
-/* Lid switch */
-GPIO(LID_OPEN,             K, 5, GPIO_INT_BOTH, lid_interrupt)
+GPIO(POWER_BUTTON_L,       K, 7, GPIO_INT_BOTH, power_button_interrupt) /* Power button */
+GPIO(LID_OPEN,             K, 5, GPIO_INT_BOTH, lid_interrupt)          /* Lid switch */
 
 /* Other inputs */
-/* Data ready from I2C thermal sensor */
-GPIO(THERMAL_DATA_READY_L, B, 4, GPIO_INPUT, NULL)
-/* AC power present */
-GPIO(AC_PRESENT,           H, 3, GPIO_INT_BOTH, extpower_interrupt)
-/* Board version stuffing resistor 1 */
-GPIO(BOARD_VERSION1,       H, 6, GPIO_INPUT, NULL)
-/* Board version stuffing resistor 2 */
-GPIO(BOARD_VERSION2,       L, 6, GPIO_INPUT, NULL)
-/* Board version stuffing resistor 3 */
-GPIO(BOARD_VERSION3,       L, 7, GPIO_INPUT, NULL)
-/* One-wire bus to adapter LED */
-GPIO(ONEWIRE,              H, 2, GPIO_INPUT, NULL)
-/* Backlight enable signal from PCH */
-GPIO(PCH_BKLTEN,           J, 3, GPIO_INT_BOTH, backlight_interrupt)
-/* SLP_A# signal from PCH */
-GPIO(PCH_SLP_A_L,          G, 5, GPIO_INT_BOTH, power_signal_interrupt)
-/* SLP_ME_CSW_DEV# signal from PCH */
-GPIO(PCH_SLP_ME_CSW_DEV_L, G, 4, GPIO_INT_BOTH, power_signal_interrupt)
-/* SLP_S3# signal from PCH */
-GPIO(PCH_SLP_S3_L,         J, 0, GPIO_INT_BOTH, power_signal_interrupt)
-/* SLP_S4# signal from PCH */
-GPIO(PCH_SLP_S4_L,         J, 1, GPIO_INT_BOTH, power_signal_interrupt)
-/* SLP_S5# signal from PCH */
-GPIO(PCH_SLP_S5_L,         J, 2, GPIO_INT_BOTH, power_signal_interrupt)
-/* SLP_SUS# signal from PCH */
-GPIO(PCH_SLP_SUS_L,        G, 3, GPIO_INT_BOTH, power_signal_interrupt)
-/* SUSWARN# signal from PCH */
-GPIO(PCH_SUSWARN_L,        G, 2, GPIO_INT_BOTH, power_interrupt)
-/* Power good on +1.5V_DDR */
-GPIO(PGOOD_1_5V_DDR,       K, 0, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on +1.5V_PCH */
-GPIO(PGOOD_1_5V_PCH,       K, 1, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on +1.8VS */
-GPIO(PGOOD_1_8VS,          K, 3, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on +5VALW */
-GPIO(PGOOD_5VALW,          H, 0, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on +CPU_CORE */
-GPIO(PGOOD_CPU_CORE,       M, 3, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on +VCCP */
-GPIO(PGOOD_VCCP,           K, 2, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on +VCCSA */
-GPIO(PGOOD_VCCSA,          H, 1, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on +VGFX_CORE */
-GPIO(PGOOD_VGFX_CORE,      D, 2, GPIO_INT_BOTH, power_signal_interrupt)
-/* Recovery signal from servo */
-GPIO(RECOVERY_L,           H, 7, GPIO_INT_BOTH, switch_interrupt)
-/* USB charger port 1 status output */
-GPIO(USB1_STATUS_L,        E, 7, GPIO_INPUT, NULL)
-/* USB charger port 2 status output */
-GPIO(USB2_STATUS_L,        E, 1, GPIO_INPUT, NULL)
-/* Write protect input */
-GPIO(WP,                   J, 4, GPIO_INT_BOTH, switch_interrupt)
+GPIO(THERMAL_DATA_READY_L, B, 4, GPIO_INPUT,    NULL)                   /* Data ready from I2C thermal sensor */
+GPIO(AC_PRESENT,           H, 3, GPIO_INT_BOTH, extpower_interrupt)     /* AC power present */
+GPIO(BOARD_VERSION1,       H, 6, GPIO_INPUT,    NULL)                   /* Board version stuffing resistor 1 */
+GPIO(BOARD_VERSION2,       L, 6, GPIO_INPUT,    NULL)                   /* Board version stuffing resistor 2 */
+GPIO(BOARD_VERSION3,       L, 7, GPIO_INPUT,    NULL)                   /* Board version stuffing resistor 3 */
+GPIO(ONEWIRE,              H, 2, GPIO_INPUT,    NULL)                   /* One-wire bus to adapter LED */
+GPIO(PCH_BKLTEN,           J, 3, GPIO_INT_BOTH, backlight_interrupt)    /* Backlight enable signal from PCH */
+GPIO(PCH_SLP_A_L,          G, 5, GPIO_INT_BOTH, power_signal_interrupt) /* SLP_A# signal from PCH */
+GPIO(PCH_SLP_ME_CSW_DEV_L, G, 4, GPIO_INT_BOTH, power_signal_interrupt) /* SLP_ME_CSW_DEV# signal from PCH */
+GPIO(PCH_SLP_S3_L,         J, 0, GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S3# signal from PCH */
+GPIO(PCH_SLP_S4_L,         J, 1, GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S4# signal from PCH */
+GPIO(PCH_SLP_S5_L,         J, 2, GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S5# signal from PCH */
+GPIO(PCH_SLP_SUS_L,        G, 3, GPIO_INT_BOTH, power_signal_interrupt) /* SLP_SUS# signal from PCH */
+GPIO(PCH_SUSWARN_L,        G, 2, GPIO_INT_BOTH, power_interrupt)        /* SUSWARN# signal from PCH */
+GPIO(PGOOD_1_5V_DDR,       K, 0, GPIO_INT_BOTH, power_signal_interrupt) /* Power good on +1.5V_DDR */
+GPIO(PGOOD_1_5V_PCH,       K, 1, GPIO_INT_BOTH, power_signal_interrupt) /* Power good on +1.5V_PCH */
+GPIO(PGOOD_1_8VS,          K, 3, GPIO_INT_BOTH, power_signal_interrupt) /* Power good on +1.8VS */
+GPIO(PGOOD_5VALW,          H, 0, GPIO_INT_BOTH, power_signal_interrupt) /* Power good on +5VALW */
+GPIO(PGOOD_CPU_CORE,       M, 3, GPIO_INT_BOTH, power_signal_interrupt) /* Power good on +CPU_CORE */
+GPIO(PGOOD_VCCP,           K, 2, GPIO_INT_BOTH, power_signal_interrupt) /* Power good on +VCCP */
+GPIO(PGOOD_VCCSA,          H, 1, GPIO_INT_BOTH, power_signal_interrupt) /* Power good on +VCCSA */
+GPIO(PGOOD_VGFX_CORE,      D, 2, GPIO_INT_BOTH, power_signal_interrupt) /* Power good on +VGFX_CORE */
+GPIO(RECOVERY_L,           H, 7, GPIO_INT_BOTH, switch_interrupt)       /* Recovery signal from servo */
+GPIO(USB1_STATUS_L,        E, 7, GPIO_INPUT, NULL)                      /* USB charger port 1 status output */
+GPIO(USB2_STATUS_L,        E, 1, GPIO_INPUT, NULL)                      /* USB charger port 2 status output */
+GPIO(WP,                   J, 4, GPIO_INT_BOTH, switch_interrupt)       /* Write protect input */
 
 /* Outputs; all unasserted by default except for reset signals */
-/* Force CPU to think it's overheated */
-GPIO(CPU_PROCHOT,          F, 2, GPIO_OUT_LOW, NULL)
-/* Enable +1.5V_DDR supply */
-GPIO(ENABLE_1_5V_DDR,      H, 5, GPIO_OUT_LOW, NULL)
-/* Enable +5V always on rail */
-GPIO(ENABLE_5VALW,         K, 4, GPIO_OUT_HIGH, NULL)
-/* Enable backlight power */
-GPIO(ENABLE_BACKLIGHT,     H, 4, GPIO_OUT_LOW, NULL)
-/* Enable touchpad power */
-GPIO(ENABLE_TOUCHPAD,      C, 6, GPIO_OUT_LOW, NULL)
-/* Enable +CPU_CORE and +VGFX_CORE */
-GPIO(ENABLE_VCORE,         F, 7, GPIO_OUT_LOW, NULL)
-/* Enable VS power supplies */
-GPIO(ENABLE_VS,            G, 6, GPIO_OUT_LOW, NULL)
-/* Enable WLAN module power (+3VS_WLAN) */
-GPIO(ENABLE_WLAN,          Q, 5, GPIO_OUT_LOW, NULL)
-/* Indicate when EC is entering RW code */
-GPIO(ENTERING_RW,          J, 5, GPIO_OUT_LOW, NULL)
-/* Reset lightbar controllers */
-GPIO(LIGHTBAR_RESET_L,     B, 1, GPIO_OUT_LOW, NULL)
-/* A20GATE signal to PCH */
-GPIO(PCH_A20GATE,          Q, 6, GPIO_OUT_LOW, NULL)
-/* DPWROK signal to PCH */
-GPIO(PCH_DPWROK,           G, 0, GPIO_OUT_LOW, NULL)
+GPIO(CPU_PROCHOT,          F, 2, GPIO_OUT_LOW,  NULL) /* Force CPU to think it's overheated */
+GPIO(ENABLE_1_5V_DDR,      H, 5, GPIO_OUT_LOW,  NULL) /* Enable +1.5V_DDR supply */
+GPIO(ENABLE_5VALW,         K, 4, GPIO_OUT_HIGH, NULL) /* Enable +5V always on rail */
+GPIO(ENABLE_BACKLIGHT,     H, 4, GPIO_OUT_LOW,  NULL) /* Enable backlight power */
+GPIO(ENABLE_TOUCHPAD,      C, 6, GPIO_OUT_LOW,  NULL) /* Enable touchpad power */
+GPIO(ENABLE_VCORE,         F, 7, GPIO_OUT_LOW,  NULL) /* Enable +CPU_CORE and +VGFX_CORE */
+GPIO(ENABLE_VS,            G, 6, GPIO_OUT_LOW,  NULL) /* Enable VS power supplies */
+GPIO(ENABLE_WLAN,          Q, 5, GPIO_OUT_LOW,  NULL) /* Enable WLAN module power (+3VS_WLAN) */
+GPIO(ENTERING_RW,          J, 5, GPIO_OUT_LOW,  NULL) /* Indicate when EC is entering RW code */
+GPIO(LIGHTBAR_RESET_L,     B, 1, GPIO_OUT_LOW,  NULL) /* Reset lightbar controllers */
+GPIO(PCH_A20GATE,          Q, 6, GPIO_OUT_LOW,  NULL) /* A20GATE signal to PCH */
+GPIO(PCH_DPWROK,           G, 0, GPIO_OUT_LOW,  NULL) /* DPWROK signal to PCH */
+
 /*
  * HDA_SDO is technically an output, but we need to leave it as an
  * input until we drive it high.  So can't use open-drain (HI_Z).
  */
-/* HDA_SDO signal to PCH; when high, ME ignores security descriptor */
-GPIO(PCH_HDA_SDO,          G, 1, GPIO_INPUT, NULL)
-/* Wake signal output to PCH */
-GPIO(PCH_WAKE_L,           F, 0, GPIO_OUT_HIGH, NULL)
-/* Non-maskable interrupt pin to PCH */
-GPIO(PCH_NMI_L,            M, 2, GPIO_OUT_HIGH, NULL)
-/* Power button output to PCH */
-GPIO(PCH_PWRBTN_L,         G, 7, GPIO_OUT_HIGH, NULL)
-/* PWROK / APWROK signals to PCH */
-GPIO(PCH_PWROK,            F, 5, GPIO_OUT_LOW, NULL)
-/* RCIN# signal to PCH */
-GPIO(PCH_RCIN_L,           Q, 7, GPIO_ODR_HIGH, NULL)
-/* Reset PCH resume power plane logic */
-GPIO(PCH_RSMRST_L,         F, 1, GPIO_OUT_LOW, NULL)
-/* Reset PCH RTC well */
-GPIO(PCH_RTCRST_L,         F, 6, GPIO_ODR_HIGH, NULL)
-/* System management interrupt to PCH */
-GPIO(PCH_SMI_L,            F, 4, GPIO_OUT_HIGH, NULL)
-/* Reset PCH ME RTC well */
-GPIO(PCH_SRTCRST_L,        C, 7, GPIO_ODR_HIGH, NULL)
-/* Acknowledge PCH SUSWARN# signal */
-GPIO(PCH_SUSACK_L,         F, 3, GPIO_OUT_HIGH, NULL)
-/* Enable WLAN radio */
-GPIO(RADIO_ENABLE_WLAN,    D, 0, GPIO_OUT_LOW, NULL)
-/* Enable bluetooth radio */
-GPIO(RADIO_ENABLE_BT,      D, 1, GPIO_OUT_LOW, NULL)
-/* SPI chip select */
-GPIO(SPI_CS_L,             A, 3, GPIO_ODR_HIGH, NULL)
-/* Reset touch screen */
-GPIO(TOUCHSCREEN_RESET_L,  B, 0, GPIO_OUT_LOW, NULL)
-/* USB charger port 1 CTL1 output */
-GPIO(USB1_CTL1,            E, 2, GPIO_OUT_LOW, NULL)
-/* USB charger port 1 CTL2 output */
-GPIO(USB1_CTL2,            E, 3, GPIO_OUT_LOW, NULL)
-/* USB charger port 1 CTL3 output */
-GPIO(USB1_CTL3,            E, 4, GPIO_OUT_LOW, NULL)
-/* USB charger port 1 enable */
-GPIO(USB1_ENABLE,          E, 5, GPIO_OUT_LOW, NULL)
-/* USB charger port 1 ILIM_SEL output */
-GPIO(USB1_ILIM_SEL,        E, 6, GPIO_OUT_LOW, NULL)
-/* USB charger port 2 CTL1 output */
-GPIO(USB2_CTL1,            D, 4, GPIO_OUT_LOW, NULL)
-/* USB charger port 2 CTL2 output */
-GPIO(USB2_CTL2,            D, 5, GPIO_OUT_LOW, NULL)
-/* USB charger port 2 CTL3 output */
-GPIO(USB2_CTL3,            D, 6, GPIO_OUT_LOW, NULL)
-/* USB charger port 2 enable */
-GPIO(USB2_ENABLE,          D, 7, GPIO_OUT_LOW, NULL)
-/* USB charger port 2 ILIM_SEL output */
-GPIO(USB2_ILIM_SEL,        E, 0, GPIO_OUT_LOW, NULL)
+GPIO(PCH_HDA_SDO,          G, 1, GPIO_INPUT,    NULL) /* HDA_SDO signal to PCH; when high, ME ignores security descriptor */
+GPIO(PCH_WAKE_L,           F, 0, GPIO_OUT_HIGH, NULL) /* Wake signal output to PCH */
+GPIO(PCH_NMI_L,            M, 2, GPIO_OUT_HIGH, NULL) /* Non-maskable interrupt pin to PCH */
+GPIO(PCH_PWRBTN_L,         G, 7, GPIO_OUT_HIGH, NULL) /* Power button output to PCH */
+GPIO(PCH_PWROK,            F, 5, GPIO_OUT_LOW,  NULL) /* PWROK / APWROK signals to PCH */
+GPIO(PCH_RCIN_L,           Q, 7, GPIO_ODR_HIGH, NULL) /* RCIN# signal to PCH */
+GPIO(PCH_RSMRST_L,         F, 1, GPIO_OUT_LOW,  NULL) /* Reset PCH resume power plane logic */
+GPIO(PCH_RTCRST_L,         F, 6, GPIO_ODR_HIGH, NULL) /* Reset PCH RTC well */
+GPIO(PCH_SMI_L,            F, 4, GPIO_OUT_HIGH, NULL) /* System management interrupt to PCH */
+GPIO(PCH_SRTCRST_L,        C, 7, GPIO_ODR_HIGH, NULL) /* Reset PCH ME RTC well */
+GPIO(PCH_SUSACK_L,         F, 3, GPIO_OUT_HIGH, NULL) /* Acknowledge PCH SUSWARN# signal */
+GPIO(RADIO_ENABLE_WLAN,    D, 0, GPIO_OUT_LOW,  NULL) /* Enable WLAN radio */
+GPIO(RADIO_ENABLE_BT,      D, 1, GPIO_OUT_LOW,  NULL) /* Enable bluetooth radio */
+GPIO(SPI_CS_L,             A, 3, GPIO_ODR_HIGH, NULL) /* SPI chip select */
+GPIO(TOUCHSCREEN_RESET_L,  B, 0, GPIO_OUT_LOW,  NULL) /* Reset touch screen */
+GPIO(USB1_CTL1,            E, 2, GPIO_OUT_LOW,  NULL) /* USB charger port 1 CTL1 output */
+GPIO(USB1_CTL2,            E, 3, GPIO_OUT_LOW,  NULL) /* USB charger port 1 CTL2 output */
+GPIO(USB1_CTL3,            E, 4, GPIO_OUT_LOW,  NULL) /* USB charger port 1 CTL3 output */
+GPIO(USB1_ENABLE,          E, 5, GPIO_OUT_LOW,  NULL) /* USB charger port 1 enable */
+GPIO(USB1_ILIM_SEL,        E, 6, GPIO_OUT_LOW,  NULL) /* USB charger port 1 ILIM_SEL output */
+GPIO(USB2_CTL1,            D, 4, GPIO_OUT_LOW,  NULL) /* USB charger port 2 CTL1 output */
+GPIO(USB2_CTL2,            D, 5, GPIO_OUT_LOW,  NULL) /* USB charger port 2 CTL2 output */
+GPIO(USB2_CTL3,            D, 6, GPIO_OUT_LOW,  NULL) /* USB charger port 2 CTL3 output */
+GPIO(USB2_ENABLE,          D, 7, GPIO_OUT_LOW,  NULL) /* USB charger port 2 enable */
+GPIO(USB2_ILIM_SEL,        E, 0, GPIO_OUT_LOW,  NULL) /* USB charger port 2 ILIM_SEL output */
diff --git a/board/nyan/gpio.inc b/board/nyan/gpio.inc
index 63be0df6cf..f8cd6720a3 100644
--- a/board/nyan/gpio.inc
+++ b/board/nyan/gpio.inc
@@ -6,12 +6,12 @@
  */
 
 /* Inputs with interrupt handlers are first for efficiency */
-GPIO(POWER_BUTTON_L, B, 5,  GPIO_INT_BOTH, power_button_interrupt)
-GPIO(SOC1V8_XPSHOLD, A, 3,  GPIO_INT_BOTH, power_signal_interrupt)
-GPIO(LID_OPEN,       C, 13, GPIO_INT_BOTH, lid_interrupt)
-GPIO(SUSPEND_L,      C, 7,  GPIO_KB_INPUT, power_signal_interrupt)
+GPIO(POWER_BUTTON_L, B, 5,  GPIO_INT_BOTH,                power_button_interrupt)
+GPIO(SOC1V8_XPSHOLD, A, 3,  GPIO_INT_BOTH,                power_signal_interrupt)
+GPIO(LID_OPEN,       C, 13, GPIO_INT_BOTH,                lid_interrupt)
+GPIO(SUSPEND_L,      C, 7,  GPIO_KB_INPUT,                power_signal_interrupt)
 GPIO(SPI1_NSS,       A, 4,  GPIO_INT_BOTH | GPIO_PULL_UP, spi_event)
-GPIO(AC_PRESENT,     A, 0,  GPIO_INT_BOTH, extpower_interrupt)
+GPIO(AC_PRESENT,     A, 0,  GPIO_INT_BOTH,                extpower_interrupt)
 
 /* Keyboard inputs */
 GPIO(KB_IN00, C, 8,  GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
diff --git a/board/peppy/gpio.inc b/board/peppy/gpio.inc
index 090c6e26a2..47c4b89a7d 100644
--- a/board/peppy/gpio.inc
+++ b/board/peppy/gpio.inc
@@ -5,143 +5,85 @@
  * found in the LICENSE file.
  */
 
-
 /* Inputs with interrupt handlers are first for efficiency */
-/* Power button */
-GPIO(POWER_BUTTON_L, A, 2, GPIO_INT_BOTH_DSLEEP, power_button_interrupt)
-/* Lid switch */
-GPIO(LID_OPEN,       A, 3, GPIO_INT_BOTH_DSLEEP, lid_interrupt)
-/* AC power present */
-GPIO(AC_PRESENT,     H, 3, GPIO_INT_BOTH_DSLEEP, extpower_interrupt)
-/* Backlight enable signal from PCH */
-GPIO(PCH_BKLTEN,     M, 3, GPIO_INT_BOTH,        backlight_interrupt)
-/* SLP_S0# signal from PCH */
-GPIO(PCH_SLP_S0_L,   G, 6, GPIO_INT_BOTH,        power_signal_interrupt)
-/* SLP_S3# signal from PCH */
-GPIO(PCH_SLP_S3_L,   G, 7, GPIO_INT_BOTH_DSLEEP, power_signal_interrupt)
-/* SLP_S5# signal from PCH */
-GPIO(PCH_SLP_S5_L,   H, 1, GPIO_INT_BOTH_DSLEEP, power_signal_interrupt)
-/* SLP_SUS# signal from PCH */
-GPIO(PCH_SLP_SUS_L,  G, 3, GPIO_INT_BOTH,        power_signal_interrupt)
-/* Power good on 1.05V */
-GPIO(PP1050_PGOOD,   H, 4, GPIO_INT_BOTH,        power_signal_interrupt)
-/* Power good on 1.35V (DRAM) */
-GPIO(PP1350_PGOOD,   H, 6, GPIO_INT_BOTH,        power_signal_interrupt)
-/* Power good on 5V */
-GPIO(PP5000_PGOOD,   N, 0, GPIO_INT_BOTH,        power_signal_interrupt)
-/* Power good on core VR */
-GPIO(VCORE_PGOOD,    C, 6, GPIO_INT_BOTH,        power_signal_interrupt)
-/* PCH wants EDP enabled */
-GPIO(PCH_EDP_VDD_EN, J, 1, GPIO_INT_BOTH,        power_interrupt)
-/* Recovery signal from servo */
-GPIO(RECOVERY_L,     A, 5, GPIO_PULL_UP | GPIO_INT_BOTH, switch_interrupt)
-/* Write protect input */
-GPIO(WP_L,           A, 4, GPIO_INT_BOTH,        switch_interrupt)
-/* JTAG clock input */
-GPIO(JTAG_TCK,       C, 0, GPIO_DEFAULT,         jtag_interrupt)
-/* UART0 RX input */
-GPIO(UART0_RX,       A, 0, GPIO_PULL_UP | GPIO_INT_BOTH_DSLEEP,
-     uart_deepsleep_interrupt)
+GPIO(POWER_BUTTON_L, A, 2, GPIO_INT_BOTH_DSLEEP,                power_button_interrupt)   /* Power button */
+GPIO(LID_OPEN,       A, 3, GPIO_INT_BOTH_DSLEEP,                lid_interrupt)            /* Lid switch */
+GPIO(AC_PRESENT,     H, 3, GPIO_INT_BOTH_DSLEEP,                extpower_interrupt)       /* AC power present */
+GPIO(PCH_BKLTEN,     M, 3, GPIO_INT_BOTH,                       backlight_interrupt)      /* Backlight enable signal from PCH */
+GPIO(PCH_SLP_S0_L,   G, 6, GPIO_INT_BOTH,                       power_signal_interrupt)   /* SLP_S0# signal from PCH */
+GPIO(PCH_SLP_S3_L,   G, 7, GPIO_INT_BOTH_DSLEEP,                power_signal_interrupt)   /* SLP_S3# signal from PCH */
+GPIO(PCH_SLP_S5_L,   H, 1, GPIO_INT_BOTH_DSLEEP,                power_signal_interrupt)   /* SLP_S5# signal from PCH */
+GPIO(PCH_SLP_SUS_L,  G, 3, GPIO_INT_BOTH,                       power_signal_interrupt)   /* SLP_SUS# signal from PCH */
+GPIO(PP1050_PGOOD,   H, 4, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on 1.05V */
+GPIO(PP1350_PGOOD,   H, 6, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on 1.35V (DRAM) */
+GPIO(PP5000_PGOOD,   N, 0, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on 5V */
+GPIO(VCORE_PGOOD,    C, 6, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on core VR */
+GPIO(PCH_EDP_VDD_EN, J, 1, GPIO_INT_BOTH,                       power_interrupt)          /* PCH wants EDP enabled */
+GPIO(RECOVERY_L,     A, 5, GPIO_PULL_UP | GPIO_INT_BOTH,        switch_interrupt)         /* Recovery signal from servo */
+GPIO(WP_L,           A, 4, GPIO_INT_BOTH,                       switch_interrupt)         /* Write protect input */
+GPIO(JTAG_TCK,       C, 0, GPIO_DEFAULT,                        jtag_interrupt)           /* JTAG clock input */
+GPIO(UART0_RX,       A, 0, GPIO_PULL_UP | GPIO_INT_BOTH_DSLEEP, uart_deepsleep_interrupt) /* UART0 RX input */
 
 /* Other inputs */
-/* From thermal sensor */
-GPIO(FAN_ALERT_L,          B, 0, GPIO_INPUT,    NULL)
-/* SUSWARN# signal from PCH */
-GPIO(PCH_SUSWARN_L,        G, 2, GPIO_INT_BOTH, NULL)
-/* USB port overcurrent warning */
-GPIO(USB1_OC_L,            E, 7, GPIO_INPUT,    NULL)
-/* USB port overcurrent warning */
-GPIO(USB2_OC_L,            E, 0, GPIO_INPUT,    NULL)
-/* Board version stuffing resistor 1 */
-GPIO(BOARD_VERSION1,       Q, 5, GPIO_INPUT,    NULL)
-/* Board version stuffing resistor 2 */
-GPIO(BOARD_VERSION2,       Q, 6, GPIO_INPUT,    NULL)
-/* Board version stuffing resistor 3 */
-GPIO(BOARD_VERSION3,       Q, 7, GPIO_INPUT,    NULL)
-/* Power good to the CPU */
-GPIO(CPU_PGOOD,            C, 4, GPIO_INPUT,    NULL)
-/* Battery present. Repurposed BAT_TEMP */
-GPIO(BAT_PRESENT_L,        B, 4, GPIO_INPUT,    NULL)
+GPIO(FAN_ALERT_L,          B, 0, GPIO_INPUT,    NULL) /* From thermal sensor */
+GPIO(PCH_SUSWARN_L,        G, 2, GPIO_INT_BOTH, NULL) /* SUSWARN# signal from PCH */
+GPIO(USB1_OC_L,            E, 7, GPIO_INPUT,    NULL) /* USB port overcurrent warning */
+GPIO(USB2_OC_L,            E, 0, GPIO_INPUT,    NULL) /* USB port overcurrent warning */
+GPIO(BOARD_VERSION1,       Q, 5, GPIO_INPUT,    NULL) /* Board version stuffing resistor 1 */
+GPIO(BOARD_VERSION2,       Q, 6, GPIO_INPUT,    NULL) /* Board version stuffing resistor 2 */
+GPIO(BOARD_VERSION3,       Q, 7, GPIO_INPUT,    NULL) /* Board version stuffing resistor 3 */
+GPIO(CPU_PGOOD,            C, 4, GPIO_INPUT,    NULL) /* Power good to the CPU */
+GPIO(BAT_PRESENT_L,        B, 4, GPIO_INPUT,    NULL) /* Battery present. Repurposed BAT_TEMP */
 
 /* Outputs; all unasserted by default except for reset signals */
-/* Force CPU to think it's overheated */
-GPIO(CPU_PROCHOT,          B, 1, GPIO_OUT_LOW, NULL)
-/* Enable 1.35V supply */
-GPIO(PP1350_EN,            H, 5, GPIO_OUT_LOW, NULL)
-/* Enable power to lots of peripherals */
-GPIO(PP3300_DX_EN,         J, 2, GPIO_OUT_LOW, NULL)
-/* Enable LTE radio */
-GPIO(PP3300_LTE_EN,        D, 2, GPIO_OUT_LOW, NULL)
-/* Enable WiFi power */
-GPIO(PP3300_WLAN_EN,       J, 0, GPIO_OUT_LOW, NULL)
-/* Enable 1.05V regulator */
-GPIO(SUSP_VR_EN,           C, 7, GPIO_OUT_LOW, NULL)
-/* Stuffing option - not connected */
-GPIO(VCORE_EN,             C, 5, GPIO_OUT_LOW, NULL)
-/* Enable 5V supply */
-GPIO(PP5000_EN,            H, 7, GPIO_OUT_LOW, NULL)
-/* Enable fan power rail */
-GPIO(PP5000_FAN_EN,        J, 3, GPIO_OUT_LOW, NULL)
-/* EC thinks everything is up and ready */
-GPIO(SYS_PWROK,            H, 2, GPIO_OUT_LOW, NULL)
-/* Disable WiFi radio */
-GPIO(WLAN_OFF_L,           J, 4, GPIO_OUT_LOW, NULL)
-/* Allow battery to charge when on AC */
-GPIO(CHARGE_L,             E, 6, GPIO_OUT_LOW, NULL)
+GPIO(CPU_PROCHOT,          B, 1, GPIO_OUT_LOW, NULL) /* Force CPU to think it's overheated */
+GPIO(PP1350_EN,            H, 5, GPIO_OUT_LOW, NULL) /* Enable 1.35V supply */
+GPIO(PP3300_DX_EN,         J, 2, GPIO_OUT_LOW, NULL) /* Enable power to lots of peripherals */
+GPIO(PP3300_LTE_EN,        D, 2, GPIO_OUT_LOW, NULL) /* Enable LTE radio */
+GPIO(PP3300_WLAN_EN,       J, 0, GPIO_OUT_LOW, NULL) /* Enable WiFi power */
+GPIO(SUSP_VR_EN,           C, 7, GPIO_OUT_LOW, NULL) /* Enable 1.05V regulator */
+GPIO(VCORE_EN,             C, 5, GPIO_OUT_LOW, NULL) /* Stuffing option - not connected */
+GPIO(PP5000_EN,            H, 7, GPIO_OUT_LOW, NULL) /* Enable 5V supply */
+GPIO(PP5000_FAN_EN,        J, 3, GPIO_OUT_LOW, NULL) /* Enable fan power rail */
+GPIO(SYS_PWROK,            H, 2, GPIO_OUT_LOW, NULL) /* EC thinks everything is up and ready */
+GPIO(WLAN_OFF_L,           J, 4, GPIO_OUT_LOW, NULL) /* Disable WiFi radio */
+GPIO(CHARGE_L,             E, 6, GPIO_OUT_LOW, NULL) /* Allow battery to charge when on AC */
+
+GPIO(ENABLE_BACKLIGHT,     M, 7, GPIO_OUT_LOW, NULL) /* Enable backlight power */
+GPIO(ENABLE_TOUCHPAD,      N, 1, GPIO_OUT_LOW, NULL) /* Enable touchpad power */
+GPIO(ENTERING_RW,          D, 3, GPIO_OUT_LOW, NULL) /* Indicate when EC is entering RW code */
+GPIO(PCH_DPWROK,           G, 0, GPIO_OUT_LOW, NULL) /* Indicate when VccDSW is good */
 
-/* Enable backlight power */
-GPIO(ENABLE_BACKLIGHT,     M, 7, GPIO_OUT_LOW, NULL)
-/* Enable touchpad power */
-GPIO(ENABLE_TOUCHPAD,      N, 1, GPIO_OUT_LOW, NULL)
-/* Indicate when EC is entering RW code */
-GPIO(ENTERING_RW,          D, 3, GPIO_OUT_LOW, NULL)
-/* Indicate when VccDSW is good */
-GPIO(PCH_DPWROK,           G, 0, GPIO_OUT_LOW, NULL)
 /*
  * HDA_SDO is technically an output, but we need to leave it as an
  * input until we drive it high.  So can't use open-drain (HI_Z).
  */
-/* HDA_SDO signal to PCH; when high, ME ignores security descriptor */
-GPIO(PCH_HDA_SDO,          G, 1, GPIO_INPUT,    NULL)
-/* Wake signal from EC to PCH */
-GPIO(PCH_WAKE_L,           F, 0, GPIO_OUT_HIGH, NULL)
-/* Non-maskable interrupt pin to PCH */
-GPIO(PCH_NMI_L,            F, 2, GPIO_OUT_HIGH, NULL)
-/* Power button output to PCH */
-GPIO(PCH_PWRBTN_L,         H, 0, GPIO_OUT_HIGH, NULL)
-/* PWROK / APWROK signals to PCH */
-GPIO(PCH_PWROK,            F, 5, GPIO_OUT_LOW,  NULL)
+GPIO(PCH_HDA_SDO,          G, 1, GPIO_INPUT,    NULL) /* HDA_SDO signal to PCH; when high, ME ignores security descriptor */
+GPIO(PCH_WAKE_L,           F, 0, GPIO_OUT_HIGH, NULL) /* Wake signal from EC to PCH */
+GPIO(PCH_NMI_L,            F, 2, GPIO_OUT_HIGH, NULL) /* Non-maskable interrupt pin to PCH */
+GPIO(PCH_PWRBTN_L,         H, 0, GPIO_OUT_HIGH, NULL) /* Power button output to PCH */
+GPIO(PCH_PWROK,            F, 5, GPIO_OUT_LOW,  NULL) /* PWROK / APWROK signals to PCH */
+
 /*
  * PL6 is one of 4 pins on the EC which can't be used in open-drain
  * mode.  To work around this PCH_RCIN_L is set to an input. It will
  * only be set to an output when it needs to be driven to 0.
  */
-/* RCIN# line to PCH (for 8042 emulation) */
-GPIO(PCH_RCIN_L,           L, 6, GPIO_INPUT,    NULL)
-/* Reset PCH resume power plane logic */
-GPIO(PCH_RSMRST_L,         F, 1, GPIO_OUT_LOW,  NULL)
-/* System management interrupt to PCH */
-GPIO(PCH_SMI_L,            F, 4, GPIO_ODR_HIGH, NULL)
-/* Reset touch screen */
-GPIO(TOUCHSCREEN_RESET_L,  N, 7, GPIO_OUT_LOW,  NULL)
-/* Enable EDP (passthru from PCH) */
-GPIO(EC_EDP_VDD_EN,        J, 5, GPIO_OUT_LOW,  NULL)
+GPIO(PCH_RCIN_L,           L, 6, GPIO_INPUT,    NULL) /* RCIN# line to PCH (for 8042 emulation) */
+GPIO(PCH_RSMRST_L,         F, 1, GPIO_OUT_LOW,  NULL) /* Reset PCH resume power plane logic */
+GPIO(PCH_SMI_L,            F, 4, GPIO_ODR_HIGH, NULL) /* System management interrupt to PCH */
+GPIO(TOUCHSCREEN_RESET_L,  N, 7, GPIO_OUT_LOW,  NULL) /* Reset touch screen */
+GPIO(EC_EDP_VDD_EN,        J, 5, GPIO_OUT_LOW,  NULL) /* Enable EDP (passthru from PCH) */
 
-/* Dunno. Probably important, though. */
-GPIO(LPC_CLKRUN_L,         M, 2, GPIO_ODR_HIGH, NULL)
-/* USB port 1 output power enable */
-GPIO(USB1_ENABLE,          E, 4, GPIO_OUT_LOW,  NULL)
-/* USB port 2 output power enable */
-GPIO(USB2_ENABLE,          D, 5, GPIO_OUT_LOW,  NULL)
+GPIO(LPC_CLKRUN_L,         M, 2, GPIO_ODR_HIGH, NULL) /* Dunno. Probably important, though. */
+GPIO(USB1_ENABLE,          E, 4, GPIO_OUT_LOW,  NULL) /* USB port 1 output power enable */
+GPIO(USB2_ENABLE,          D, 5, GPIO_OUT_LOW,  NULL) /* USB port 2 output power enable */
 
-/* Acknowledge PCH SUSWARN# signal */
-GPIO(PCH_SUSACK_L,         F, 3, GPIO_OUT_HIGH, NULL)
-/* Not supposed to be here */
-GPIO(PCH_RTCRST_L,         F, 6, GPIO_ODR_HIGH, NULL)
-/* Not supposed to be here */
-GPIO(PCH_SRTCRST_L,        F, 7, GPIO_ODR_HIGH, NULL)
+GPIO(PCH_SUSACK_L,         F, 3, GPIO_OUT_HIGH, NULL) /* Acknowledge PCH SUSWARN# signal */
+GPIO(PCH_RTCRST_L,         F, 6, GPIO_ODR_HIGH, NULL) /* Not supposed to be here */
+GPIO(PCH_SRTCRST_L,        F, 7, GPIO_ODR_HIGH, NULL) /* Not supposed to be here */
 
-GPIO(BAT_LED0_L, D, 0, GPIO_ODR_HIGH, NULL) /* Battery charging LED - blue */
-GPIO(BAT_LED1_L, N, 4, GPIO_ODR_HIGH, NULL) /* Battery charging LED - orange */
-GPIO(PWR_LED0_L, D, 1, GPIO_ODR_HIGH, NULL) /* Power LED - blue */
-GPIO(PWR_LED1_L, N, 6, GPIO_ODR_HIGH, NULL) /* Power LED - orange */
+GPIO(BAT_LED0_L,           D, 0, GPIO_ODR_HIGH, NULL) /* Battery charging LED - blue */
+GPIO(BAT_LED1_L,           N, 4, GPIO_ODR_HIGH, NULL) /* Battery charging LED - orange */
+GPIO(PWR_LED0_L,           D, 1, GPIO_ODR_HIGH, NULL) /* Power LED - blue */
+GPIO(PWR_LED1_L,           N, 6, GPIO_ODR_HIGH, NULL) /* Power LED - orange */
diff --git a/board/pit/gpio.inc b/board/pit/gpio.inc
index 7f2e5295fa..2f64bf01e3 100644
--- a/board/pit/gpio.inc
+++ b/board/pit/gpio.inc
@@ -6,14 +6,14 @@
  */
 
 /* Inputs with interrupt handlers are first for efficiency */
-GPIO(KB_PWR_ON_L,    B, 5,  GPIO_INT_BOTH,    power_signal_interrupt)
-GPIO(PP1800_LDO2,    A, 1,  GPIO_INT_BOTH,    power_signal_interrupt)
-GPIO(SOC1V8_XPSHOLD, A, 3,  GPIO_INT_RISING,  power_signal_interrupt)
-GPIO(CHARGER_INT_L,  C, 6,  GPIO_INT_FALLING, pmu_irq_handler)
-GPIO(LID_OPEN,       C, 13, GPIO_INT_BOTH,    lid_interrupt)
-GPIO(SUSPEND_L,      C, 7,  GPIO_INT_BOTH,    power_signal_interrupt)
+GPIO(KB_PWR_ON_L,    B, 5,  GPIO_INT_BOTH,                power_signal_interrupt)
+GPIO(PP1800_LDO2,    A, 1,  GPIO_INT_BOTH,                power_signal_interrupt)
+GPIO(SOC1V8_XPSHOLD, A, 3,  GPIO_INT_RISING,              power_signal_interrupt)
+GPIO(CHARGER_INT_L,  C, 6,  GPIO_INT_FALLING,             pmu_irq_handler)
+GPIO(LID_OPEN,       C, 13, GPIO_INT_BOTH,                lid_interrupt)
+GPIO(SUSPEND_L,      C, 7,  GPIO_INT_BOTH,                power_signal_interrupt)
 GPIO(SPI1_NSS,       A, 4,  GPIO_INT_BOTH | GPIO_PULL_UP, spi_event)
-GPIO(AC_PRESENT,     A, 0,  GPIO_INT_BOTH,    extpower_interrupt)
+GPIO(AC_PRESENT,     A, 0,  GPIO_INT_BOTH,                extpower_interrupt)
 
 /* Keyboard inputs */
 GPIO(KB_IN00,     C, 8,  GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
diff --git a/board/rambi/gpio.inc b/board/rambi/gpio.inc
index 3ac32f5468..cdeac22574 100644
--- a/board/rambi/gpio.inc
+++ b/board/rambi/gpio.inc
@@ -6,33 +6,19 @@
  */
 
 /* Inputs with interrupt handlers are first for efficiency */
-GPIO(POWER_BUTTON_L,   A, 2, GPIO_INT_BOTH_DSLEEP,
-     power_button_interrupt)
-GPIO(LID_OPEN,         A, 3, GPIO_INT_BOTH_DSLEEP, lid_interrupt)
-GPIO(AC_PRESENT,       H, 3, GPIO_INT_BOTH_DSLEEP, extpower_interrupt)
-/* SLP_S3# signal from PCH */
-GPIO(PCH_SLP_S3_L,     G, 7, GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP,
-     power_signal_interrupt)
-/* SLP_S4# signal from PCH */
-GPIO(PCH_SLP_S4_L,     H, 1, GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP,
-     power_signal_interrupt)
-/* Power good on 1.05V */
-GPIO(PP1050_PGOOD,     H, 4, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on 3.3V (PCH supply) */
-GPIO(PP3300_PCH_PGOOD, C, 4, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on 5V */
-GPIO(PP5000_PGOOD,     N, 0, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on S5 supplies */
-GPIO(S5_PGOOD,         G, 0, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on core VR */
-GPIO(VCORE_PGOOD,      C, 6, GPIO_INT_BOTH, power_signal_interrupt)
-/* Write protect input */
-GPIO(WP_L,             A, 4, GPIO_INT_BOTH, switch_interrupt)
-/* JTAG clock input */
-GPIO(JTAG_TCK,         C, 0, GPIO_DEFAULT, jtag_interrupt)
-/* UART0 RX input */
-GPIO(UART0_RX,         A, 0, GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP,
-     uart_deepsleep_interrupt)
+GPIO(POWER_BUTTON_L,   A, 2, GPIO_INT_BOTH_DSLEEP,                power_button_interrupt)
+GPIO(LID_OPEN,         A, 3, GPIO_INT_BOTH_DSLEEP,                lid_interrupt)
+GPIO(AC_PRESENT,       H, 3, GPIO_INT_BOTH_DSLEEP,                extpower_interrupt)
+GPIO(PCH_SLP_S3_L,     G, 7, GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, power_signal_interrupt)   /* SLP_S3# signal from PCH */
+GPIO(PCH_SLP_S4_L,     H, 1, GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, power_signal_interrupt)   /* SLP_S4# signal from PCH */
+GPIO(PP1050_PGOOD,     H, 4, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on 1.05V */
+GPIO(PP3300_PCH_PGOOD, C, 4, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on 3.3V (PCH supply) */
+GPIO(PP5000_PGOOD,     N, 0, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on 5V */
+GPIO(S5_PGOOD,         G, 0, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on S5 supplies */
+GPIO(VCORE_PGOOD,      C, 6, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on core VR */
+GPIO(WP_L,             A, 4, GPIO_INT_BOTH,                       switch_interrupt)         /* Write protect input */
+GPIO(JTAG_TCK,         C, 0, GPIO_DEFAULT,                        jtag_interrupt)           /* JTAG clock input */
+GPIO(UART0_RX,         A, 0, GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, uart_deepsleep_interrupt) /* UART0 RX input */
 
 /* Other inputs */
 GPIO(BOARD_VERSION1, Q, 5, GPIO_INPUT, NULL)
@@ -40,80 +26,42 @@ GPIO(BOARD_VERSION2, Q, 6, GPIO_INPUT, NULL)
 GPIO(BOARD_VERSION3, Q, 7, GPIO_INPUT, NULL)
 
 #ifdef CONFIG_CHIPSET_DEBUG
-/* SLP_S0IX# signal from PCH */
-GPIO(PCH_SLP_SX_L,         G, 3, GPIO_INPUT | GPIO_PULL_UP, NULL)
-/* SUS_STAT# signal from PCH */
-GPIO(PCH_SUS_STAT_L,       G, 6, GPIO_INPUT | GPIO_PULL_UP, NULL)
-/* SUSPWRDNACK signal from PCH */
-GPIO(PCH_SUSPWRDNACK,      G, 2, GPIO_INPUT | GPIO_PULL_UP, NULL)
+GPIO(PCH_SLP_SX_L,        G, 3, GPIO_INPUT | GPIO_PULL_UP, NULL) /* SLP_S0IX# signal from PCH */
+GPIO(PCH_SUS_STAT_L,      G, 6, GPIO_INPUT | GPIO_PULL_UP, NULL) /* SUS_STAT# signal from PCH */
+GPIO(PCH_SUSPWRDNACK,     G, 2, GPIO_INPUT | GPIO_PULL_UP, NULL) /* SUSPWRDNACK signal from PCH */
 #endif
 
-/* Power good on 1.00V (S0iX supplies) */
-GPIO(PP1000_S0IX_PGOOD,    H, 6, GPIO_INPUT, NULL)
-/* USB port overcurrent warning */
-GPIO(USB1_OC_L,            E, 7, GPIO_INPUT, NULL)
-/* USB port overcurrent warning */
-GPIO(USB2_OC_L,            E, 0, GPIO_INPUT, NULL)
+GPIO(PP1000_S0IX_PGOOD,   H, 6, GPIO_INPUT, NULL) /* Power good on 1.00V (S0iX supplies) */
+GPIO(USB1_OC_L,           E, 7, GPIO_INPUT, NULL) /* USB port overcurrent warning */
+GPIO(USB2_OC_L,           E, 0, GPIO_INPUT, NULL) /* USB port overcurrent warning */
 
 /* Outputs; all unasserted by default except for reset signals */
-/* Force CPU to think it's overheated */
-GPIO(CPU_PROCHOT,          B, 5, GPIO_OUT_LOW,  NULL)
-
-
-/* Enable backlight power */
-GPIO(ENABLE_BACKLIGHT,     M, 7, GPIO_ODR_HIGH, NULL)
-/* Enable touchpad power */
-GPIO(ENABLE_TOUCHPAD,      N, 1, GPIO_OUT_LOW,  NULL)
-/* Indicate when EC is entering RW code */
-GPIO(ENTERING_RW,          D, 6, GPIO_OUT_LOW,  NULL)
-/* Request that PCH drive LPC clock */
-GPIO(LPC_CLKRUN_L,         M, 2, GPIO_ODR_HIGH, NULL)
-/* Indicate core well power is stable */
-GPIO(PCH_CORE_PWROK,       F, 5, GPIO_OUT_LOW,  NULL)
-/* Power button output to PCH */
-GPIO(PCH_PWRBTN_L,         H, 0, GPIO_ODR_HIGH, NULL)
-/* Reset line to PCH (for 8042 emulation) */
-GPIO(PCH_RCIN_L,           F, 3, GPIO_ODR_HIGH, NULL)
-/* Reset PCH resume power plane logic */
-GPIO(PCH_RSMRST_L,         F, 1, GPIO_OUT_LOW,  NULL)
-/* System management interrupt to PCH */
-GPIO(PCH_SMI_L,            F, 4, GPIO_ODR_HIGH, NULL)
-/* SOC override signal to PCH; when high, ME
- * ignores security descriptor */
-GPIO(PCH_SOC_OVERRIDE,     G, 1, GPIO_OUT_LOW,  NULL)
-/* EC thinks everything is up and ready */
-GPIO(PCH_SYS_PWROK,        J, 1, GPIO_OUT_LOW,  NULL)
-/* Wake signal from EC to PCH */
-GPIO(PCH_WAKE_L,           F, 0, GPIO_ODR_HIGH, NULL)
-/* Enable 1.35V supply */
-GPIO(PP1350_EN,            H, 5, GPIO_OUT_LOW,  NULL)
-/* Enable power to lots of peripherals */
-GPIO(PP3300_DX_EN,         J, 2, GPIO_OUT_LOW,  NULL)
-/* Enable LTE radio */
-GPIO(PP3300_LTE_EN,        D, 4, GPIO_OUT_LOW,  NULL)
-/* Enable WiFi power */
-GPIO(PP3300_WLAN_EN,       J, 0, GPIO_OUT_LOW,  NULL)
-/* Enable 5V supply */
-GPIO(PP5000_EN,            H, 7, GPIO_OUT_LOW,  NULL)
-/* Enable PP1350_PCH_SX, PP1000_PCH_SX */
-GPIO(PPSX_EN,              L, 6, GPIO_OUT_LOW,  NULL)
-/* Enable 1.05V regulator */
-GPIO(SUSP_VR_EN,           C, 7, GPIO_OUT_LOW,  NULL)
-/* Reset touch screen */
-GPIO(TOUCHSCREEN_RESET_L,  N, 7, GPIO_OUT_LOW,  NULL)
-/* USB control signal 1 to both ports */
-GPIO(USB_CTL1,             E, 6, GPIO_OUT_LOW,  NULL)
-/* USB current limit to both ports */
-GPIO(USB_ILIM_SEL,         E, 5, GPIO_OUT_LOW,  NULL)
-/* USB port 1 output power enable */
-GPIO(USB1_ENABLE,          E, 4, GPIO_OUT_LOW,  NULL)
-/* USB port 2 output power enable */
-GPIO(USB2_ENABLE,          D, 5, GPIO_OUT_LOW,  NULL)
-/* Enable core power supplies */
-GPIO(VCORE_EN,             C, 5, GPIO_OUT_LOW,  NULL)
-/* Disable WiFi radio */
-GPIO(WLAN_OFF_L,           J, 4, GPIO_OUT_LOW,  NULL)
-/* Assert SCI to PCH */
-GPIO(PCH_SCI_L,            M, 1, GPIO_ODR_HIGH, NULL)
-/* Negative edge triggered irq. */
-GPIO(KBD_IRQ_L,            M, 3, GPIO_ODR_HIGH, NULL)
+GPIO(CPU_PROCHOT,         B, 5, GPIO_OUT_LOW,  NULL) /* Force CPU to think it's overheated */
+GPIO(ENABLE_BACKLIGHT,    M, 7, GPIO_ODR_HIGH, NULL) /* Enable backlight power */
+GPIO(ENABLE_TOUCHPAD,     N, 1, GPIO_OUT_LOW,  NULL) /* Enable touchpad power */
+GPIO(ENTERING_RW,         D, 6, GPIO_OUT_LOW,  NULL) /* Indicate when EC is entering RW code */
+GPIO(LPC_CLKRUN_L,        M, 2, GPIO_ODR_HIGH, NULL) /* Request that PCH drive LPC clock */
+GPIO(PCH_CORE_PWROK,      F, 5, GPIO_OUT_LOW,  NULL) /* Indicate core well power is stable */
+GPIO(PCH_PWRBTN_L,        H, 0, GPIO_ODR_HIGH, NULL) /* Power button output to PCH */
+GPIO(PCH_RCIN_L,          F, 3, GPIO_ODR_HIGH, NULL) /* Reset line to PCH (for 8042 emulation) */
+GPIO(PCH_RSMRST_L,        F, 1, GPIO_OUT_LOW,  NULL) /* Reset PCH resume power plane logic */
+GPIO(PCH_SMI_L,           F, 4, GPIO_ODR_HIGH, NULL) /* System management interrupt to PCH */
+GPIO(PCH_SOC_OVERRIDE,    G, 1, GPIO_OUT_LOW,  NULL) /* SOC override signal to PCH; when high, ME ignores security descriptor */
+GPIO(PCH_SYS_PWROK,       J, 1, GPIO_OUT_LOW,  NULL) /* EC thinks everything is up and ready */
+GPIO(PCH_WAKE_L,          F, 0, GPIO_ODR_HIGH, NULL) /* Wake signal from EC to PCH */
+GPIO(PP1350_EN,           H, 5, GPIO_OUT_LOW,  NULL) /* Enable 1.35V supply */
+GPIO(PP3300_DX_EN,        J, 2, GPIO_OUT_LOW,  NULL) /* Enable power to lots of peripherals */
+GPIO(PP3300_LTE_EN,       D, 4, GPIO_OUT_LOW,  NULL) /* Enable LTE radio */
+GPIO(PP3300_WLAN_EN,      J, 0, GPIO_OUT_LOW,  NULL) /* Enable WiFi power */
+GPIO(PP5000_EN,           H, 7, GPIO_OUT_LOW,  NULL) /* Enable 5V supply */
+GPIO(PPSX_EN,             L, 6, GPIO_OUT_LOW,  NULL) /* Enable PP1350_PCH_SX, PP1000_PCH_SX */
+GPIO(SUSP_VR_EN,          C, 7, GPIO_OUT_LOW,  NULL) /* Enable 1.05V regulator */
+GPIO(TOUCHSCREEN_RESET_L, N, 7, GPIO_OUT_LOW,  NULL) /* Reset touch screen */
+GPIO(USB_CTL1,            E, 6, GPIO_OUT_LOW,  NULL) /* USB control signal 1 to both ports */
+GPIO(USB_ILIM_SEL,        E, 5, GPIO_OUT_LOW,  NULL) /* USB current limit to both ports */
+GPIO(USB1_ENABLE,         E, 4, GPIO_OUT_LOW,  NULL) /* USB port 1 output power enable */
+GPIO(USB2_ENABLE,         D, 5, GPIO_OUT_LOW,  NULL) /* USB port 2 output power enable */
+GPIO(VCORE_EN,            C, 5, GPIO_OUT_LOW,  NULL) /* Enable core power supplies */
+GPIO(WLAN_OFF_L,          J, 4, GPIO_OUT_LOW,  NULL) /* Disable WiFi radio */
+GPIO(PCH_SCI_L,           M, 1, GPIO_ODR_HIGH, NULL) /* Assert SCI to PCH */
+GPIO(KBD_IRQ_L,           M, 3, GPIO_ODR_HIGH, NULL) /* Negative edge triggered irq. */
diff --git a/board/samus/gpio.inc b/board/samus/gpio.inc
index f1d259b1e4..d1c954a17a 100644
--- a/board/samus/gpio.inc
+++ b/board/samus/gpio.inc
@@ -6,41 +6,23 @@
  */
 
 /* Inputs with interrupt handlers are first for efficiency */
-/* Power button */
-GPIO(POWER_BUTTON_L, A, 2, GPIO_INT_BOTH_DSLEEP, power_button_interrupt)
-/* Lid switch */
-GPIO(LID_OPEN,       A, 3, GPIO_INT_BOTH_DSLEEP, lid_interrupt)
-/* AC power present */
-GPIO(AC_PRESENT,     H, 3, GPIO_INT_BOTH_DSLEEP, extpower_interrupt)
-/* SLP_S0# signal from PCH */
-GPIO(PCH_SLP_S0_L,   G, 6, GPIO_INT_BOTH, power_signal_interrupt)
-/* SLP_S3# signal from PCH */
-GPIO(PCH_SLP_S3_L,   G, 7, GPIO_INT_BOTH_DSLEEP, power_signal_interrupt)
-/* SLP_S5# signal from PCH */
-GPIO(PCH_SLP_S5_L,   H, 1, GPIO_INT_BOTH_DSLEEP, power_signal_interrupt)
-/* SLP_SUS# signal from PCH */
-GPIO(PCH_SLP_SUS_L,  G, 3, GPIO_INT_BOTH, power_signal_interrupt)
-/* SUSWARN# signal from PCH */
-GPIO(PCH_SUSWARN_L,  G, 2, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on 1.05V */
-GPIO(PP1050_PGOOD,   H, 4, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on 1.2V (DRAM) */
-GPIO(PP1200_PGOOD,   H, 6, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on 1.8V (DRAM) */
-GPIO(PP1800_PGOOD,   L, 7, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on core VR */
-GPIO(VCORE_PGOOD,    C, 6, GPIO_INT_BOTH, power_signal_interrupt)
-/* Recovery signal from servo */
-GPIO(RECOVERY_L,     A, 5, GPIO_PULL_UP | GPIO_INT_BOTH, switch_interrupt)
-/* Write protect input */
-GPIO(WP_L,           A, 4, GPIO_INT_BOTH,   switch_interrupt)
-/* PCH backlight input */
-GPIO(PCH_BL_EN,      M, 3, GPIO_INT_RISING, backlight_interrupt)
-/* JTAG clock input */
-GPIO(JTAG_TCK,       C, 0, GPIO_DEFAULT,    jtag_interrupt)
-/* UART0 RX input */
-GPIO(UART0_RX,       A, 0, GPIO_PULL_UP | GPIO_INT_BOTH_DSLEEP,
-     uart_deepsleep_interrupt)
+GPIO(POWER_BUTTON_L, A, 2, GPIO_INT_BOTH_DSLEEP,                power_button_interrupt)   /* Power button */
+GPIO(LID_OPEN,       A, 3, GPIO_INT_BOTH_DSLEEP,                lid_interrupt)            /* Lid switch */
+GPIO(AC_PRESENT,     H, 3, GPIO_INT_BOTH_DSLEEP,                extpower_interrupt)       /* AC power present */
+GPIO(PCH_SLP_S0_L,   G, 6, GPIO_INT_BOTH,                       power_signal_interrupt)   /* SLP_S0# signal from PCH */
+GPIO(PCH_SLP_S3_L,   G, 7, GPIO_INT_BOTH_DSLEEP,                power_signal_interrupt)   /* SLP_S3# signal from PCH */
+GPIO(PCH_SLP_S5_L,   H, 1, GPIO_INT_BOTH_DSLEEP,                power_signal_interrupt)   /* SLP_S5# signal from PCH */
+GPIO(PCH_SLP_SUS_L,  G, 3, GPIO_INT_BOTH,                       power_signal_interrupt)   /* SLP_SUS# signal from PCH */
+GPIO(PCH_SUSWARN_L,  G, 2, GPIO_INT_BOTH,                       power_signal_interrupt)   /* SUSWARN# signal from PCH */
+GPIO(PP1050_PGOOD,   H, 4, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on 1.05V */
+GPIO(PP1200_PGOOD,   H, 6, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on 1.2V (DRAM) */
+GPIO(PP1800_PGOOD,   L, 7, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on 1.8V (DRAM) */
+GPIO(VCORE_PGOOD,    C, 6, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on core VR */
+GPIO(RECOVERY_L,     A, 5, GPIO_PULL_UP | GPIO_INT_BOTH,        switch_interrupt)         /* Recovery signal from servo */
+GPIO(WP_L,           A, 4, GPIO_INT_BOTH,                       switch_interrupt)         /* Write protect input */
+GPIO(PCH_BL_EN,      M, 3, GPIO_INT_RISING,                     backlight_interrupt)      /* PCH backlight input */
+GPIO(JTAG_TCK,       C, 0, GPIO_DEFAULT,                        jtag_interrupt)           /* JTAG clock input */
+GPIO(UART0_RX,       A, 0, GPIO_PULL_UP | GPIO_INT_BOTH_DSLEEP, uart_deepsleep_interrupt) /* UART0 RX input */
 
 /*
  * Combined accelerometer input. This will become an interrupt, once we have
@@ -56,112 +38,62 @@ GPIO(CAPSENSE_INT_L, N, 0, GPIO_INPUT, NULL)
 #endif
 
 /* Interrupt signal from PD MCU */
-GPIO(PD_MCU_INT_L,   J, 5, GPIO_PULL_UP | GPIO_INT_FALLING | GPIO_INT_DSLEEP,
-     pd_mcu_interrupt)
+GPIO(PD_MCU_INT_L, J, 5, GPIO_PULL_UP | GPIO_INT_FALLING | GPIO_INT_DSLEEP, pd_mcu_interrupt)
 
 /* Other inputs */
-/* Board version stuffing resistor 1 */
-GPIO(BOARD_VERSION1,       Q, 7, GPIO_INPUT, NULL)
-/* Board version stuffing resistor 2 */
-GPIO(BOARD_VERSION2,       Q, 6, GPIO_INPUT, NULL)
-/* Board version stuffing resistor 3 */
-GPIO(BOARD_VERSION3,       Q, 5, GPIO_INPUT, NULL)
-/* USB port overcurrent warning */
-GPIO(USB1_OC_L,            E, 7, GPIO_INPUT, NULL)
-/* USB charger port 1 status output */
-GPIO(USB1_STATUS_L,        E, 6, GPIO_INPUT, NULL)
-/* USB port overcurrent warning */
-GPIO(USB2_OC_L,            E, 0, GPIO_INPUT, NULL)
-/* USB charger port 2 status output */
-GPIO(USB2_STATUS_L,        D, 7, GPIO_INPUT, NULL)
+GPIO(BOARD_VERSION1, Q, 7, GPIO_INPUT, NULL) /* Board version stuffing resistor 1 */
+GPIO(BOARD_VERSION2, Q, 6, GPIO_INPUT, NULL) /* Board version stuffing resistor 2 */
+GPIO(BOARD_VERSION3, Q, 5, GPIO_INPUT, NULL) /* Board version stuffing resistor 3 */
+GPIO(USB1_OC_L,      E, 7, GPIO_INPUT, NULL) /* USB port overcurrent warning */
+GPIO(USB1_STATUS_L,  E, 6, GPIO_INPUT, NULL) /* USB charger port 1 status output */
+GPIO(USB2_OC_L,      E, 0, GPIO_INPUT, NULL) /* USB port overcurrent warning */
+GPIO(USB2_STATUS_L,  D, 7, GPIO_INPUT, NULL) /* USB charger port 2 status output */
 
 /* Outputs; all unasserted by default except for reset signals */
-/* Force CPU to think it's overheated */
-GPIO(CPU_PROCHOT,          B, 1, GPIO_OUT_LOW,  NULL)
-/* Enable 1.20V supply */
-GPIO(PP1200_EN,            H, 5, GPIO_OUT_LOW,  NULL)
-/* Enable 3.3V DSW rail */
-GPIO(PP3300_DSW_EN,        F, 6, GPIO_OUT_LOW,  NULL)
-/* Enable 3.3V Gated DSW and core VDD */
-GPIO(PP3300_DSW_GATED_EN,  J, 3, GPIO_OUT_LOW,  NULL)
-/* Enable LTE radio */
-GPIO(PP3300_LTE_EN,        D, 2, GPIO_OUT_LOW,  NULL)
-/* Enable WiFi power */
-GPIO(PP3300_WLAN_EN,       J, 0, GPIO_OUT_LOW,  NULL)
-/* Enable Accelerometer power */
-GPIO(PP3300_ACCEL_EN,      J, 1, GPIO_OUT_HIGH, NULL)
-/* Enable 1.05V regulator */
-GPIO(PP1050_EN,            C, 7, GPIO_OUT_LOW,  NULL)
-/* Enable USB power */
-GPIO(PP5000_USB_EN,        C, 5, GPIO_OUT_LOW,  NULL)
-/* Enable 5V supply */
-GPIO(PP5000_EN,            H, 7, GPIO_OUT_LOW,  NULL)
-/* Enable 1.8V supply */
-GPIO(PP1800_EN,            L, 6, GPIO_OUT_LOW,  NULL)
-/* EC thinks everything is up and ready */
-GPIO(SYS_PWROK,            H, 2, GPIO_OUT_LOW,  NULL)
-/* Disable WiFi radio */
-GPIO(WLAN_OFF_L,           J, 4, GPIO_OUT_LOW,  NULL)
-/* USB PD MCU reset */
-GPIO(USB_MCU_RST_L,        B, 0, GPIO_ODR_HIGH, NULL)
-/* Enable backlight power */
-GPIO(ENABLE_BACKLIGHT,     M, 7, GPIO_OUT_LOW,  NULL)
-/* Enable touchpad power */
-GPIO(ENABLE_TOUCHPAD,      N, 1, GPIO_OUT_LOW,  NULL)
-/* Indicate when EC is entering RW code */
-GPIO(ENTERING_RW,          D, 3, GPIO_OUT_LOW,  NULL)
-/* Reset lightbar controllers */
-GPIO(LIGHTBAR_RESET_L,     J, 2, GPIO_ODR_LOW,  NULL)
-/* Indicate when VccDSW is good */
-GPIO(PCH_DPWROK,           G, 0, GPIO_OUT_LOW,  NULL)
-/* Reset PCH resume power plane logic */
-GPIO(PCH_RSMRST_L,         C, 4, GPIO_OUT_LOW,  NULL)
+GPIO(CPU_PROCHOT,         B, 1, GPIO_OUT_LOW,  NULL) /* Force CPU to think it's overheated */
+GPIO(PP1200_EN,           H, 5, GPIO_OUT_LOW,  NULL) /* Enable 1.20V supply */
+GPIO(PP3300_DSW_EN,       F, 6, GPIO_OUT_LOW,  NULL) /* Enable 3.3V DSW rail */
+GPIO(PP3300_DSW_GATED_EN, J, 3, GPIO_OUT_LOW,  NULL) /* Enable 3.3V Gated DSW and core VDD */
+GPIO(PP3300_LTE_EN,       D, 2, GPIO_OUT_LOW,  NULL) /* Enable LTE radio */
+GPIO(PP3300_WLAN_EN,      J, 0, GPIO_OUT_LOW,  NULL) /* Enable WiFi power */
+GPIO(PP3300_ACCEL_EN,     J, 1, GPIO_OUT_HIGH, NULL) /* Enable Accelerometer power */
+GPIO(PP1050_EN,           C, 7, GPIO_OUT_LOW,  NULL) /* Enable 1.05V regulator */
+GPIO(PP5000_USB_EN,       C, 5, GPIO_OUT_LOW,  NULL) /* Enable USB power */
+GPIO(PP5000_EN,           H, 7, GPIO_OUT_LOW,  NULL) /* Enable 5V supply */
+GPIO(PP1800_EN,           L, 6, GPIO_OUT_LOW,  NULL) /* Enable 1.8V supply */
+GPIO(SYS_PWROK,           H, 2, GPIO_OUT_LOW,  NULL) /* EC thinks everything is up and ready */
+GPIO(WLAN_OFF_L,          J, 4, GPIO_OUT_LOW,  NULL) /* Disable WiFi radio */
+GPIO(USB_MCU_RST_L,       B, 0, GPIO_ODR_HIGH, NULL) /* USB PD MCU reset */
+GPIO(ENABLE_BACKLIGHT,    M, 7, GPIO_OUT_LOW,  NULL) /* Enable backlight power */
+GPIO(ENABLE_TOUCHPAD,     N, 1, GPIO_OUT_LOW,  NULL) /* Enable touchpad power */
+GPIO(ENTERING_RW,         D, 3, GPIO_OUT_LOW,  NULL) /* Indicate when EC is entering RW code */
+GPIO(LIGHTBAR_RESET_L,    J, 2, GPIO_ODR_LOW,  NULL) /* Reset lightbar controllers */
+GPIO(PCH_DPWROK,          G, 0, GPIO_OUT_LOW,  NULL) /* Indicate when VccDSW is good */
+GPIO(PCH_RSMRST_L,        C, 4, GPIO_OUT_LOW,  NULL) /* Reset PCH resume power plane logic */
 /*
  * HDA_SDO is technically an output, but we need to leave it as an
  * input until we drive it high.  So can't use open-drain (HI_Z).
  */
-/* HDA_SDO signal to PCH; when high, ME
- * ignores security descriptor */
-GPIO(PCH_HDA_SDO,          G, 1, GPIO_INPUT,    NULL)
-/* Wake signal from EC to PCH */
-GPIO(PCH_WAKE_L,           F, 0, GPIO_ODR_HIGH, NULL)
-/* Non-maskable interrupt pin to PCH */
-GPIO(PCH_NMI_L,            F, 2, GPIO_ODR_HIGH, NULL)
-/* Power button output to PCH */
-GPIO(PCH_PWRBTN_L,         H, 0, GPIO_ODR_HIGH, NULL)
-/* PWROK / APWROK signals to PCH */
-GPIO(PCH_PWROK,            F, 5, GPIO_OUT_LOW,  NULL)
-/* RCIN# line to PCH (for 8042 emulation) */
-GPIO(PCH_RCIN_L,           F, 3, GPIO_ODR_HIGH, NULL)
-/* Reset PCH resume power plane logic */
-GPIO(PCH_SYS_RST_L,        F, 1, GPIO_ODR_HIGH, NULL)
-/* System management interrupt to PCH */
-GPIO(PCH_SMI_L,            F, 4, GPIO_ODR_HIGH, NULL)
-/* Reset touch screen */
-GPIO(TOUCHSCREEN_RESET_L,  N, 7, GPIO_ODR_LOW,  NULL)
-/* AC present signal buffered to PCH */
-GPIO(PCH_ACOK,             M, 6, GPIO_OUT_LOW,  NULL)
+GPIO(PCH_HDA_SDO,         G, 1, GPIO_INPUT,    NULL) /* HDA_SDO signal to PCH; when high, ME ignores security descriptor */
+GPIO(PCH_WAKE_L,          F, 0, GPIO_ODR_HIGH, NULL) /* Wake signal from EC to PCH */
+GPIO(PCH_NMI_L,           F, 2, GPIO_ODR_HIGH, NULL) /* Non-maskable interrupt pin to PCH */
+GPIO(PCH_PWRBTN_L,        H, 0, GPIO_ODR_HIGH, NULL) /* Power button output to PCH */
+GPIO(PCH_PWROK,           F, 5, GPIO_OUT_LOW,  NULL) /* PWROK / APWROK signals to PCH */
+GPIO(PCH_RCIN_L,          F, 3, GPIO_ODR_HIGH, NULL) /* RCIN# line to PCH (for 8042 emulation) */
+GPIO(PCH_SYS_RST_L,       F, 1, GPIO_ODR_HIGH, NULL) /* Reset PCH resume power plane logic */
+GPIO(PCH_SMI_L,           F, 4, GPIO_ODR_HIGH, NULL) /* System management interrupt to PCH */
+GPIO(TOUCHSCREEN_RESET_L, N, 7, GPIO_ODR_LOW,  NULL) /* Reset touch screen */
+GPIO(PCH_ACOK,            M, 6, GPIO_OUT_LOW,  NULL) /* AC present signal buffered to PCH */
 #ifndef HEY_USE_BUILTIN_CLKRUN
-/* Dunno. Probably important, though. */
-GPIO(LPC_CLKRUN_L,         M, 2, GPIO_ODR_HIGH, NULL)
+GPIO(LPC_CLKRUN_L,        M, 2, GPIO_ODR_HIGH, NULL) /* Dunno. Probably important, though. */
 #endif
-/* USB charger port 1 CTL1 output */
-GPIO(USB1_CTL1,            E, 1, GPIO_OUT_LOW,  NULL)
-/* USB charger port 1 CTL2 output */
-GPIO(USB1_CTL2,            E, 2, GPIO_OUT_HIGH, NULL)
-/* USB charger port 1 CTL3 output */
-GPIO(USB1_CTL3,            E, 3, GPIO_OUT_LOW,  NULL)
-/* USB charger port 1 enable */
-GPIO(USB1_ENABLE,          E, 4, GPIO_OUT_HIGH, NULL)
-/* USB charger port 1 ILIM_SEL output */
-GPIO(USB1_ILIM_SEL,        E, 5, GPIO_OUT_LOW,  NULL)
-/* USB charger port 2 CTL1 output */
-GPIO(USB2_CTL1,            D, 0, GPIO_OUT_LOW,  NULL)
-/* USB charger port 2 CTL2 output */
-GPIO(USB2_CTL2,            D, 1, GPIO_OUT_HIGH, NULL)
-/* USB charger port 2 CTL3 output */
-GPIO(USB2_CTL3,            D, 4, GPIO_OUT_LOW,  NULL)
-/* USB charger port 2 enable */
-GPIO(USB2_ENABLE,          D, 5, GPIO_OUT_HIGH, NULL)
-/* USB charger port 2 ILIM_SEL output */
-GPIO(USB2_ILIM_SEL,        D, 6, GPIO_OUT_LOW,  NULL)
+GPIO(USB1_CTL1,           E, 1, GPIO_OUT_LOW,  NULL) /* USB charger port 1 CTL1 output */
+GPIO(USB1_CTL2,           E, 2, GPIO_OUT_HIGH, NULL) /* USB charger port 1 CTL2 output */
+GPIO(USB1_CTL3,           E, 3, GPIO_OUT_LOW,  NULL) /* USB charger port 1 CTL3 output */
+GPIO(USB1_ENABLE,         E, 4, GPIO_OUT_HIGH, NULL) /* USB charger port 1 enable */
+GPIO(USB1_ILIM_SEL,       E, 5, GPIO_OUT_LOW,  NULL) /* USB charger port 1 ILIM_SEL output */
+GPIO(USB2_CTL1,           D, 0, GPIO_OUT_LOW,  NULL) /* USB charger port 2 CTL1 output */
+GPIO(USB2_CTL2,           D, 1, GPIO_OUT_HIGH, NULL) /* USB charger port 2 CTL2 output */
+GPIO(USB2_CTL3,           D, 4, GPIO_OUT_LOW,  NULL) /* USB charger port 2 CTL3 output */
+GPIO(USB2_ENABLE,         D, 5, GPIO_OUT_HIGH, NULL) /* USB charger port 2 enable */
+GPIO(USB2_ILIM_SEL,       D, 6, GPIO_OUT_LOW,  NULL) /* USB charger port 2 ILIM_SEL output */
diff --git a/board/snow/gpio.inc b/board/snow/gpio.inc
index 77210d1ffc..194c0d6f06 100644
--- a/board/snow/gpio.inc
+++ b/board/snow/gpio.inc
@@ -6,19 +6,13 @@
  */
 
 /* Inputs with interrupt handlers are first for efficiency */
-/* Keyboard power button */
-GPIO(KB_PWR_ON_L,    B, 5,  GPIO_INT_BOTH,     power_signal_interrupt)
-/* LDO2 is ON (end of PMIC sequence) */
-GPIO(PP1800_LDO2,    A, 1,  GPIO_INT_BOTH,     power_signal_interrupt)
-/* App Processor ON  */
-GPIO(SOC1V8_XPSHOLD, A, 3,  GPIO_INT_BOTH,     power_signal_interrupt)
+GPIO(KB_PWR_ON_L,    B, 5,  GPIO_INT_BOTH,     power_signal_interrupt) /* Keyboard power button */
+GPIO(PP1800_LDO2,    A, 1,  GPIO_INT_BOTH,     power_signal_interrupt) /* LDO2 is ON (end of PMIC sequence) */
+GPIO(SOC1V8_XPSHOLD, A, 3,  GPIO_INT_BOTH,     power_signal_interrupt) /* App Processor ON  */
 GPIO(CHARGER_INT_L,  C, 4,  GPIO_INT_FALLING,  pmu_irq_handler)
-/* LID switch detection */
-GPIO(LID_OPEN,       C, 13, GPIO_INT_BOTH,     lid_interrupt)
-/* AP suspend/resume state */
-GPIO(SUSPEND_L,      A, 7,  INT_BOTH_FLOATING, power_signal_interrupt)
-/* Write protection pin (low active) */
-GPIO(WP_L,           B, 4,  GPIO_INPUT,        NULL)
+GPIO(LID_OPEN,       C, 13, GPIO_INT_BOTH,     lid_interrupt)          /* LID switch detection */
+GPIO(SUSPEND_L,      A, 7,  INT_BOTH_FLOATING, power_signal_interrupt) /* AP suspend/resume state */
+GPIO(WP_L,           B, 4,  GPIO_INPUT,        NULL)                   /* Write protection pin (low active) */
 
 /* Keyboard inputs */
 GPIO(KB_IN00, C, 8,  GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
diff --git a/board/spring/gpio.inc b/board/spring/gpio.inc
index 02478a5674..173d1e19e3 100644
--- a/board/spring/gpio.inc
+++ b/board/spring/gpio.inc
@@ -7,18 +7,13 @@
 
 /* Inputs with interrupt handlers are first for efficiency */
 /* Keyboard power button */
-GPIO(KB_PWR_ON_L,    B, 5, GPIO_INT_BOTH,      power_signal_interrupt)
-/* LDO2 is ON (end of PMIC sequence) */
-GPIO(PP1800_LDO2,    A, 1, GPIO_INT_BOTH,      power_signal_interrupt)
-/* App Processor ON  */
-GPIO(SOC1V8_XPSHOLD, A, 3, GPIO_INT_BOTH,      power_signal_interrupt)
-GPIO(CHARGER_INT_L,  C, 4, GPIO_INT_FALLING,   pmu_irq_handler)
-/* LID switch detection */
-GPIO(LID_OPEN,       C, 13, GPIO_INT_BOTH,     lid_interrupt)
-/* AP suspend/resume state */
-GPIO(SUSPEND_L,      A, 7,  INT_BOTH_FLOATING, power_signal_interrupt)
-/* Write protection pin (low active) */
-GPIO(WP_L,           A, 13, GPIO_INPUT,        NULL)
+GPIO(KB_PWR_ON_L,    B, 5,  GPIO_INT_BOTH,     power_signal_interrupt)
+GPIO(PP1800_LDO2,    A, 1,  GPIO_INT_BOTH,     power_signal_interrupt) /* LDO2 is ON (end of PMIC sequence) */
+GPIO(SOC1V8_XPSHOLD, A, 3,  GPIO_INT_BOTH,     power_signal_interrupt) /* App Processor ON  */
+GPIO(CHARGER_INT_L,  C, 4,  GPIO_INT_FALLING,  pmu_irq_handler)
+GPIO(LID_OPEN,       C, 13, GPIO_INT_BOTH,     lid_interrupt)          /* LID switch detection */
+GPIO(SUSPEND_L,      A, 7,  INT_BOTH_FLOATING, power_signal_interrupt) /* AP suspend/resume state */
+GPIO(WP_L,           A, 13, GPIO_INPUT,        NULL)                   /* Write protection pin (low active) */
 
 /* Keyboard inputs */
 GPIO(KB_IN00,     C, 8,  GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
@@ -49,9 +44,7 @@ GPIO(EN_PP5000,   A, 11, GPIO_OUT_LOW,   NULL) /* 5.0v rail enable */
 GPIO(EN_PP3300,   A, 8,  GPIO_OUT_LOW,   NULL) /* 3.3v rail enable */
 GPIO(PMIC_PWRON_L,A, 12, GPIO_OUT_HIGH,  NULL) /* 5v rail ready */
 GPIO(PMIC_RESET,  A, 15, GPIO_OUT_LOW,   NULL) /* Force hard reset of the pmic */
-
-/* EC is R/W mode for the kbc mux */
-GPIO(ENTERING_RW, D, 0,  GPIO_OUT_LOW,   NULL)
+GPIO(ENTERING_RW, D, 0,  GPIO_OUT_LOW,   NULL) /* EC is R/W mode for the kbc mux */
 GPIO(CHARGER_EN,  B, 2,  GPIO_OUT_LOW,   NULL)
 GPIO(EC_INT,      B, 9,  GPIO_ODR_HIGH,  NULL)
 GPIO(ID_MUX,      D, 1,  GPIO_OUT_LOW,   NULL)
diff --git a/board/squawks/gpio.inc b/board/squawks/gpio.inc
index 51400c7c8e..8707c8f9cc 100644
--- a/board/squawks/gpio.inc
+++ b/board/squawks/gpio.inc
@@ -6,111 +6,62 @@
  */
 
 /* Inputs with interrupt handlers are first for efficiency */
-/* Power button */
-GPIO(POWER_BUTTON_L,       A, 2, GPIO_INT_BOTH_DSLEEP, power_button_interrupt)
-/* Lid switch */
-GPIO(LID_OPEN,             A, 3, GPIO_INT_BOTH_DSLEEP, lid_interrupt)
-/* AC power present */
-GPIO(AC_PRESENT,           H, 3, GPIO_INT_BOTH_DSLEEP, extpower_interrupt)
-/* SLP_S3# signal from PCH */
-GPIO(PCH_SLP_S3_L,         G, 7, GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, power_signal_interrupt)
-/* SLP_S4# signal from PCH */
-GPIO(PCH_SLP_S4_L,         H, 1, GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, power_signal_interrupt)
-/* Power good on 1.05V */
-GPIO(PP1050_PGOOD,         H, 4, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on 3.3V (PCH supply) */
-GPIO(PP3300_PCH_PGOOD,     C, 4, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on 5V */
-GPIO(PP5000_PGOOD,         N, 0, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on S5 supplies */
-GPIO(S5_PGOOD,             G, 0, GPIO_INT_BOTH, power_signal_interrupt)
-/* Power good on core VR */
-GPIO(VCORE_PGOOD,          C, 6, GPIO_INT_BOTH, power_signal_interrupt)
-/* Write protect input */
-GPIO(WP_L,                 A, 4, GPIO_INT_BOTH, switch_interrupt)
-/* JTAG clock input */
-GPIO(JTAG_TCK,             C, 0, GPIO_DEFAULT, jtag_interrupt)
-/* UART0 RX input */
-GPIO(UART0_RX,             A, 0, GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, uart_deepsleep_interrupt)
+GPIO(POWER_BUTTON_L,   A, 2, GPIO_INT_BOTH_DSLEEP,                power_button_interrupt)   /* Power button */
+GPIO(LID_OPEN,         A, 3, GPIO_INT_BOTH_DSLEEP,                lid_interrupt)            /* Lid switch */
+GPIO(AC_PRESENT,       H, 3, GPIO_INT_BOTH_DSLEEP,                extpower_interrupt)       /* AC power present */
+GPIO(PCH_SLP_S3_L,     G, 7, GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, power_signal_interrupt)   /* SLP_S3# signal from PCH */
+GPIO(PCH_SLP_S4_L,     H, 1, GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, power_signal_interrupt)   /* SLP_S4# signal from PCH */
+GPIO(PP1050_PGOOD,     H, 4, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on 1.05V */
+GPIO(PP3300_PCH_PGOOD, C, 4, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on 3.3V (PCH supply) */
+GPIO(PP5000_PGOOD,     N, 0, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on 5V */
+GPIO(S5_PGOOD,         G, 0, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on S5 supplies */
+GPIO(VCORE_PGOOD,      C, 6, GPIO_INT_BOTH,                       power_signal_interrupt)   /* Power good on core VR */
+GPIO(WP_L,             A, 4, GPIO_INT_BOTH,                       switch_interrupt)         /* Write protect input */
+GPIO(JTAG_TCK,         C, 0, GPIO_DEFAULT,                        jtag_interrupt)           /* JTAG clock input */
+GPIO(UART0_RX,         A, 0, GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, uart_deepsleep_interrupt) /* UART0 RX input */
 
 /* Other inputs */
-/* Board version stuffing resistor 1 */
-GPIO(BOARD_VERSION1,       Q, 5, GPIO_INPUT, NULL)
-/* Board version stuffing resistor 2 */
-GPIO(BOARD_VERSION2,       Q, 6, GPIO_INPUT, NULL)
-/* Board version stuffing resistor 3 */
-GPIO(BOARD_VERSION3,       Q, 7, GPIO_INPUT, NULL)
+GPIO(BOARD_VERSION1, Q, 5, GPIO_INPUT, NULL) /* Board version stuffing resistor 1 */
+GPIO(BOARD_VERSION2, Q, 6, GPIO_INPUT, NULL) /* Board version stuffing resistor 2 */
+GPIO(BOARD_VERSION3, Q, 7, GPIO_INPUT, NULL) /* Board version stuffing resistor 3 */
+
 #ifdef CONFIG_CHIPSET_DEBUG
-/* SLP_S0IX# signal from PCH */
-GPIO(PCH_SLP_SX_L,         G, 3, GPIO_INPUT | GPIO_PULL_UP, NULL)
-/* SUS_STAT# signal from PCH */
-GPIO(PCH_SUS_STAT_L,       G, 6, GPIO_INPUT | GPIO_PULL_UP, NULL)
-/* SUSPWRDNACK signal from PCH */
-GPIO(PCH_SUSPWRDNACK,      G, 2, GPIO_INPUT | GPIO_PULL_UP, NULL)
+GPIO(PCH_SLP_SX_L,    G, 3, GPIO_INPUT | GPIO_PULL_UP, NULL) /* SLP_S0IX# signal from PCH */
+GPIO(PCH_SUS_STAT_L,  G, 6, GPIO_INPUT | GPIO_PULL_UP, NULL) /* SUS_STAT# signal from PCH */
+GPIO(PCH_SUSPWRDNACK, G, 2, GPIO_INPUT | GPIO_PULL_UP, NULL) /* SUSPWRDNACK signal from PCH */
 #endif
-/* Power good on 1.00V (S0iX supplies) */
-GPIO(PP1000_S0IX_PGOOD,    H, 6, GPIO_INPUT, NULL)
-/* USB port overcurrent warning */
-GPIO(USB1_OC_L,            E, 7, GPIO_INPUT, NULL)
-/* USB port overcurrent warning */
-GPIO(USB2_OC_L,            E, 0, GPIO_INPUT, NULL)
+
+GPIO(PP1000_S0IX_PGOOD, H, 6, GPIO_INPUT, NULL) /* Power good on 1.00V (S0iX supplies) */
+GPIO(USB1_OC_L,         E, 7, GPIO_INPUT, NULL) /* USB port overcurrent warning */
+GPIO(USB2_OC_L,         E, 0, GPIO_INPUT, NULL) /* USB port overcurrent warning */
 
 /* Outputs; all unasserted by default except for reset signals */
-/* Force CPU to think it's overheated */
-GPIO(CPU_PROCHOT,          B, 5, GPIO_OUT_LOW,  NULL)
-/* Enable backlight power */
-GPIO(ENABLE_BACKLIGHT,     M, 7, GPIO_ODR_HIGH, NULL)
-/* Enable touchpad power */
-GPIO(ENABLE_TOUCHPAD,      N, 1, GPIO_OUT_LOW,  NULL)
-/* Indicate when EC is entering RW code */
-GPIO(ENTERING_RW,          D, 6, GPIO_OUT_LOW,  NULL)
-/* Request that PCH drive LPC clock */
-GPIO(LPC_CLKRUN_L,         M, 2, GPIO_ODR_HIGH, NULL)
-/* Indicate core well power is stable */
-GPIO(PCH_CORE_PWROK,       F, 5, GPIO_OUT_LOW,  NULL)
-/* Power button output to PCH */
-GPIO(PCH_PWRBTN_L,         H, 0, GPIO_ODR_HIGH, NULL)
-/* Reset line to PCH (for 8042 emulation) */
-GPIO(PCH_RCIN_L,           F, 3, GPIO_ODR_HIGH, NULL)
-/* Reset PCH resume power plane logic */
-GPIO(PCH_RSMRST_L,         F, 1, GPIO_OUT_LOW,  NULL)
-/* System management interrupt to PCH */
-GPIO(PCH_SMI_L,            F, 4, GPIO_ODR_HIGH, NULL)
-/* SOC override signal to PCH; when high, ME ignores security descriptor */
-GPIO(PCH_SOC_OVERRIDE,     G, 1, GPIO_OUT_LOW,  NULL)
-/* EC thinks everything is up and ready */
-GPIO(PCH_SYS_PWROK,        J, 1, GPIO_OUT_LOW,  NULL)
-/* Wake signal from EC to PCH */
-GPIO(PCH_WAKE_L,           F, 0, GPIO_ODR_HIGH, NULL)
-/* Enable 1.35V supply */
-GPIO(PP1350_EN,            H, 5, GPIO_OUT_LOW,  NULL)
-/* Enable power to lots of peripherals */
-GPIO(PP3300_DX_EN,         J, 2, GPIO_OUT_LOW,  NULL)
-/* Enable LTE radio */
-GPIO(PP3300_LTE_EN,        D, 4, GPIO_OUT_LOW,  NULL)
-/* Enable WiFi power */
-GPIO(PP3300_WLAN_EN,       J, 0, GPIO_OUT_LOW,  NULL)
-/* Enable 5V supply */
-GPIO(PP5000_EN,            H, 7, GPIO_OUT_LOW,  NULL)
-/* Enable PP1350_PCH_SX, PP1000_PCH_SX */
-GPIO(PPSX_EN,              L, 6, GPIO_OUT_LOW,  NULL)
-/* Enable 1.05V regulator */
-GPIO(SUSP_VR_EN,           C, 7, GPIO_OUT_LOW,  NULL)
-/* Reset touch screen */
-GPIO(TOUCHSCREEN_RESET_L,  N, 7, GPIO_OUT_LOW,  NULL)
-/* USB control signal 1 to both ports */
-GPIO(USB_CTL1,             E, 6, GPIO_OUT_LOW,  NULL)
-/* USB current limit to both ports */
-GPIO(USB_ILIM_SEL,         E, 5, GPIO_OUT_LOW,  NULL)
-/* USB port 1 output power enable */
-GPIO(USB1_ENABLE,          E, 4, GPIO_OUT_LOW,  NULL)
-/* USB port 2 output power enable */
-GPIO(USB2_ENABLE,          D, 5, GPIO_OUT_LOW,  NULL)
-/* Enable core power supplies */
-GPIO(VCORE_EN,             C, 5, GPIO_OUT_LOW,  NULL)
-/* Disable WiFi radio */
-GPIO(WLAN_OFF_L,           J, 4, GPIO_OUT_LOW,  NULL)
-/* Assert SCI to PCH */
-GPIO(PCH_SCI_L,            M, 1, GPIO_ODR_HIGH, NULL)
-/* Negative edge triggered irq. */
-GPIO(KBD_IRQ_L,            M, 3, GPIO_ODR_HIGH, NULL)
+GPIO(CPU_PROCHOT,         B, 5, GPIO_OUT_LOW,  NULL) /* Force CPU to think it's overheated */
+GPIO(ENABLE_BACKLIGHT,    M, 7, GPIO_ODR_HIGH, NULL) /* Enable backlight power */
+GPIO(ENABLE_TOUCHPAD,     N, 1, GPIO_OUT_LOW,  NULL) /* Enable touchpad power */
+GPIO(ENTERING_RW,         D, 6, GPIO_OUT_LOW,  NULL) /* Indicate when EC is entering RW code */
+GPIO(LPC_CLKRUN_L,        M, 2, GPIO_ODR_HIGH, NULL) /* Request that PCH drive LPC clock */
+GPIO(PCH_CORE_PWROK,      F, 5, GPIO_OUT_LOW,  NULL) /* Indicate core well power is stable */
+GPIO(PCH_PWRBTN_L,        H, 0, GPIO_ODR_HIGH, NULL) /* Power button output to PCH */
+GPIO(PCH_RCIN_L,          F, 3, GPIO_ODR_HIGH, NULL) /* Reset line to PCH (for 8042 emulation) */
+GPIO(PCH_RSMRST_L,        F, 1, GPIO_OUT_LOW,  NULL) /* Reset PCH resume power plane logic */
+GPIO(PCH_SMI_L,           F, 4, GPIO_ODR_HIGH, NULL) /* System management interrupt to PCH */
+GPIO(PCH_SOC_OVERRIDE,    G, 1, GPIO_OUT_LOW,  NULL) /* SOC override signal to PCH; when high, ME ignores security descriptor */
+GPIO(PCH_SYS_PWROK,       J, 1, GPIO_OUT_LOW,  NULL) /* EC thinks everything is up and ready */
+GPIO(PCH_WAKE_L,          F, 0, GPIO_ODR_HIGH, NULL) /* Wake signal from EC to PCH */
+GPIO(PP1350_EN,           H, 5, GPIO_OUT_LOW,  NULL) /* Enable 1.35V supply */
+GPIO(PP3300_DX_EN,        J, 2, GPIO_OUT_LOW,  NULL) /* Enable power to lots of peripherals */
+GPIO(PP3300_LTE_EN,       D, 4, GPIO_OUT_LOW,  NULL) /* Enable LTE radio */
+GPIO(PP3300_WLAN_EN,      J, 0, GPIO_OUT_LOW,  NULL) /* Enable WiFi power */
+GPIO(PP5000_EN,           H, 7, GPIO_OUT_LOW,  NULL) /* Enable 5V supply */
+GPIO(PPSX_EN,             L, 6, GPIO_OUT_LOW,  NULL) /* Enable PP1350_PCH_SX, PP1000_PCH_SX */
+GPIO(SUSP_VR_EN,          C, 7, GPIO_OUT_LOW,  NULL) /* Enable 1.05V regulator */
+GPIO(TOUCHSCREEN_RESET_L, N, 7, GPIO_OUT_LOW,  NULL) /* Reset touch screen */
+GPIO(USB_CTL1,            E, 6, GPIO_OUT_LOW,  NULL) /* USB control signal 1 to both ports */
+GPIO(USB_ILIM_SEL,        E, 5, GPIO_OUT_LOW,  NULL) /* USB current limit to both ports */
+GPIO(USB1_ENABLE,         E, 4, GPIO_OUT_LOW,  NULL) /* USB port 1 output power enable */
+GPIO(USB2_ENABLE,         D, 5, GPIO_OUT_LOW,  NULL) /* USB port 2 output power enable */
+GPIO(VCORE_EN,            C, 5, GPIO_OUT_LOW,  NULL) /* Enable core power supplies */
+GPIO(WLAN_OFF_L,          J, 4, GPIO_OUT_LOW,  NULL) /* Disable WiFi radio */
+GPIO(PCH_SCI_L,           M, 1, GPIO_ODR_HIGH, NULL) /* Assert SCI to PCH */
+GPIO(KBD_IRQ_L,           M, 3, GPIO_ODR_HIGH, NULL) /* Negative edge triggered irq. */