summaryrefslogtreecommitdiff
path: root/board/llama/gpio.inc
diff options
context:
space:
mode:
Diffstat (limited to 'board/llama/gpio.inc')
-rw-r--r--board/llama/gpio.inc83
1 files changed, 42 insertions, 41 deletions
diff --git a/board/llama/gpio.inc b/board/llama/gpio.inc
index 0ad76346c7..a13246ecca 100644
--- a/board/llama/gpio.inc
+++ b/board/llama/gpio.inc
@@ -6,58 +6,59 @@
*/
/* Inputs with interrupt handlers are first for efficiency */
-GPIO(AC_PRESENT, A, 0, GPIO_INT_BOTH, extpower_interrupt) /* AC power present: PA 0 */
-GPIO(POWER_BUTTON_L, B, 5, GPIO_INT_BOTH | GPIO_PULL_UP, power_button_interrupt) /* Keyboard power button: PB 5 */
-GPIO(SOC_POWER_GOOD_L, A, 3, GPIO_INT_BOTH, power_signal_interrupt)
-GPIO(LID_OPEN, C, 13, GPIO_INT_BOTH, lid_interrupt) /* LID switch detection */
-GPIO(SUSPEND_L, C, 7, GPIO_INT_BOTH, power_signal_interrupt) /* AP suspend/resume state */
-GPIO(5V_GOOD_L, A, 1, GPIO_INT_BOTH, NULL)
-GPIO(AP_RESET_H, B, 3, GPIO_OUT_LOW, NULL)
-GPIO(BOARD_VERSION1, C, 6, GPIO_INPUT|GPIO_PULL_UP, NULL) /* Board version stuffing resistor 1 */
+GPIO_INT(AC_PRESENT, A, 0, GPIO_INT_BOTH, extpower_interrupt) /* AC power present: PA 0 */
+GPIO_INT(POWER_BUTTON_L, B, 5, GPIO_INT_BOTH | GPIO_PULL_UP, power_button_interrupt) /* Keyboard power button: PB 5 */
+GPIO_INT(SOC_POWER_GOOD_L, A, 3, GPIO_INT_BOTH, power_signal_interrupt)
+GPIO_INT(LID_OPEN, C, 13, GPIO_INT_BOTH, lid_interrupt) /* LID switch detection */
+GPIO_INT(SUSPEND_L, C, 7, GPIO_INT_BOTH, power_signal_interrupt) /* AP suspend/resume state */
+
+/* Keyboard inputs */
+GPIO_INT(KB_IN00, C, 8, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO_INT(KB_IN01, C, 9, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO_INT(KB_IN02, C, 10, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO_INT(KB_IN03, C, 11, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO_INT(KB_IN04, C, 12, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO_INT(KB_IN05, C, 14, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO_INT(KB_IN06, C, 15, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO_INT(KB_IN07, D, 2, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
/* SPI Chip Select */
-GPIO(SPI1_NSS, A, 4, GPIO_INT_BOTH | GPIO_PULL_UP, spi_event)
+GPIO_INT(SPI1_NSS, A, 4, GPIO_INT_BOTH | GPIO_PULL_UP, spi_event)
-/* Keyboard inputs */
-GPIO(KB_IN00, C, 8, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
-GPIO(KB_IN01, C, 9, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
-GPIO(KB_IN02, C, 10, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
-GPIO(KB_IN03, C, 11, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
-GPIO(KB_IN04, C, 12, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
-GPIO(KB_IN05, C, 14, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
-GPIO(KB_IN06, C, 15, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
-GPIO(KB_IN07, D, 2, GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO(5V_GOOD_L, A, 1, GPIO_INT_BOTH)
+GPIO(AP_RESET_H, B, 3, GPIO_OUT_LOW)
+GPIO(BOARD_VERSION1, C, 6, GPIO_INPUT|GPIO_PULL_UP) /* Board version stuffing resistor 1 */
/* Outputs */
-GPIO(BAT_LED0, B, 11, GPIO_OUT_LOW, NULL) /* LED_GREEN */
-GPIO(BAT_LED1, A, 11, GPIO_OUT_LOW, NULL) /* LED_ORANGE */
-GPIO(EC_BL_OVERRIDE, F, 1, GPIO_OUT_LOW, NULL)
-GPIO(EC_INT, B, 9, GPIO_OUT_HIGH, NULL)
-GPIO(ENTERING_RW, F, 0, GPIO_OUT_LOW, NULL)
-GPIO(KB_OUT00, B, 0, GPIO_KB_OUTPUT, NULL)
-GPIO(KB_OUT01, B, 8, GPIO_KB_OUTPUT, NULL)
-GPIO(KB_OUT02, B, 12, GPIO_OUT_LOW, NULL) /* KSO2 is inverted */
-GPIO(KB_OUT03, B, 13, GPIO_KB_OUTPUT, NULL)
-GPIO(KB_OUT04, B, 14, GPIO_KB_OUTPUT, NULL)
-GPIO(KB_OUT05, B, 15, GPIO_KB_OUTPUT, NULL)
-GPIO(KB_OUT06, C, 0, GPIO_KB_OUTPUT, NULL)
-GPIO(KB_OUT07, C, 1, GPIO_KB_OUTPUT, NULL)
-GPIO(KB_OUT08, C, 2, GPIO_KB_OUTPUT, NULL)
-GPIO(KB_OUT09, B, 1, GPIO_KB_OUTPUT, NULL)
-GPIO(KB_OUT10, C, 5, GPIO_KB_OUTPUT, NULL)
-GPIO(KB_OUT11, C, 4, GPIO_KB_OUTPUT, NULL)
-GPIO(KB_OUT12, A, 14, GPIO_KB_OUTPUT, NULL)
-GPIO(SYSTEM_POWER_H, B, 10, GPIO_OUT_LOW, NULL)
-GPIO(PMIC_PWRON_H, A, 12, GPIO_OUT_LOW, NULL)
-GPIO(PMIC_WARM_RESET_H, C, 3, GPIO_ODR_LOW, NULL)
+GPIO(BAT_LED0, B, 11, GPIO_OUT_LOW) /* LED_GREEN */
+GPIO(BAT_LED1, A, 11, GPIO_OUT_LOW) /* LED_ORANGE */
+GPIO(EC_BL_OVERRIDE, F, 1, GPIO_OUT_LOW)
+GPIO(EC_INT, B, 9, GPIO_OUT_HIGH)
+GPIO(ENTERING_RW, F, 0, GPIO_OUT_LOW)
+GPIO(KB_OUT00, B, 0, GPIO_KB_OUTPUT)
+GPIO(KB_OUT01, B, 8, GPIO_KB_OUTPUT)
+GPIO(KB_OUT02, B, 12, GPIO_OUT_LOW) /* KSO2 is inverted */
+GPIO(KB_OUT03, B, 13, GPIO_KB_OUTPUT)
+GPIO(KB_OUT04, B, 14, GPIO_KB_OUTPUT)
+GPIO(KB_OUT05, B, 15, GPIO_KB_OUTPUT)
+GPIO(KB_OUT06, C, 0, GPIO_KB_OUTPUT)
+GPIO(KB_OUT07, C, 1, GPIO_KB_OUTPUT)
+GPIO(KB_OUT08, C, 2, GPIO_KB_OUTPUT)
+GPIO(KB_OUT09, B, 1, GPIO_KB_OUTPUT)
+GPIO(KB_OUT10, C, 5, GPIO_KB_OUTPUT)
+GPIO(KB_OUT11, C, 4, GPIO_KB_OUTPUT)
+GPIO(KB_OUT12, A, 14, GPIO_KB_OUTPUT)
+GPIO(SYSTEM_POWER_H, B, 10, GPIO_OUT_LOW)
+GPIO(PMIC_PWRON_H, A, 12, GPIO_OUT_LOW)
+GPIO(PMIC_WARM_RESET_H, C, 3, GPIO_ODR_LOW)
/*
* I2C pins should be configured as inputs until I2C module is
* initialized. This will avoid driving the lines unintentionally.
*/
-GPIO(MASTER_I2C_SCL, B, 6, GPIO_INPUT, NULL)
-GPIO(MASTER_I2C_SDA, B, 7, GPIO_INPUT, NULL)
+GPIO(MASTER_I2C_SCL, B, 6, GPIO_INPUT)
+GPIO(MASTER_I2C_SDA, B, 7, GPIO_INPUT)
/* Unimplemented signals which we need to emulate for now */
/* UNIMPLEMENTED(ENTERING_RW) */