summaryrefslogtreecommitdiff
path: root/board/honeybuns/gpio.inc
diff options
context:
space:
mode:
Diffstat (limited to 'board/honeybuns/gpio.inc')
-rw-r--r--board/honeybuns/gpio.inc39
1 files changed, 19 insertions, 20 deletions
diff --git a/board/honeybuns/gpio.inc b/board/honeybuns/gpio.inc
index e61972a6a3..553ab618fc 100644
--- a/board/honeybuns/gpio.inc
+++ b/board/honeybuns/gpio.inc
@@ -5,42 +5,42 @@
* found in the LICENSE file.
*/
-/*GPIO(DP_HPD, A, 0, GPIO_INT_BOTH, hpd_event)*/
-GPIO(DP_HPD, A, 0, GPIO_INPUT, NULL)
+/*GPIO_INT(DP_HPD, A, 0, GPIO_INT_BOTH, hpd_event)*/
+GPIO(DP_HPD, A, 0, GPIO_INPUT)
/* PD RX/TX */
-GPIO(USB_CC1_PD, A, 1, GPIO_ANALOG, NULL)
-GPIO(PD_VBUS_P, A, 5, GPIO_ANALOG, NULL)
-GPIO(PD_VBUS_N, A, 6, GPIO_ANALOG, NULL)
-GPIO(PD_TX_EN, A, 15, GPIO_OUT_LOW, NULL)
-GPIO(PD_TX_DATA, B, 4, GPIO_OUT_LOW, NULL)
+GPIO(USB_CC1_PD, A, 1, GPIO_ANALOG)
+GPIO(PD_VBUS_P, A, 5, GPIO_ANALOG)
+GPIO(PD_VBUS_N, A, 6, GPIO_ANALOG)
+GPIO(PD_TX_EN, A, 15, GPIO_OUT_LOW)
+GPIO(PD_TX_DATA, B, 4, GPIO_OUT_LOW)
/* Power and muxes control */
-GPIO(PP20000_EN, A, 8, GPIO_OUT_LOW, NULL)
-GPIO(PPVAR_VBUS_EN, B, 12, GPIO_OUT_LOW, NULL)
-GPIO(SS_MUX_OE_L, B, 13, GPIO_OUT_HIGH, NULL)
-GPIO(SS_MUX_SEL, B, 14, GPIO_OUT_LOW, NULL)
+GPIO(PP20000_EN, A, 8, GPIO_OUT_LOW)
+GPIO(PPVAR_VBUS_EN, B, 12, GPIO_OUT_LOW)
+GPIO(SS_MUX_OE_L, B, 13, GPIO_OUT_HIGH)
+GPIO(SS_MUX_SEL, B, 14, GPIO_OUT_LOW)
/* Display Port/HDMI */
-GPIO(PD_SBU_ENABLE, A, 7, GPIO_OUT_LOW, NULL)
+GPIO(PD_SBU_ENABLE, A, 7, GPIO_OUT_LOW)
/* Chip Resets */
-GPIO(BRIDGE_RESET_L, B, 0, GPIO_OUT_HIGH, NULL)
-GPIO(SPLITTER_RESET_L, B, 1, GPIO_OUT_HIGH, NULL)
-GPIO(HUB_RESET_L, B, 15, GPIO_OUT_HIGH, NULL)
+GPIO(BRIDGE_RESET_L, B, 0, GPIO_OUT_HIGH)
+GPIO(SPLITTER_RESET_L, B, 1, GPIO_OUT_HIGH)
+GPIO(HUB_RESET_L, B, 15, GPIO_OUT_HIGH)
/*
* 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)
/* Test points */
-GPIO(TP6, A, 13, GPIO_OUT_HIGH /*GPIO_ODR_HIGH*/, NULL)
-GPIO(TP7, A, 14, GPIO_OUT_LOW /*GPIO_ODR_HIGH*/, NULL)
+GPIO(TP6, A, 13, GPIO_OUT_HIGH /*GPIO_ODR_HIGH*/)
+GPIO(TP7, A, 14, GPIO_OUT_LOW /*GPIO_ODR_HIGH*/)
/* Unimplemented signals which we need to emulate for now */
UNIMPLEMENTED(ENTERING_RW)
@@ -52,4 +52,3 @@ ALTERNATE(A, 0x0600, 1, MODULE_UART, GPIO_PULL_UP) /* USART1: PA9/PA10 */
ALTERNATE(A, 0x000C, 1, MODULE_UART, GPIO_PULL_UP) /* USART2: PA2/PA3 */
ALTERNATE(B, 0x0C00, 4, MODULE_UART, GPIO_PULL_UP) /* USART3: PB10/PB11 */
ALTERNATE(B, 0x00C0, 1, MODULE_I2C, 0) /* I2C MASTER: PB6/PB7 */
-