diff options
| author | Steven Jian <steven.jian@intel.com> | 2015-04-01 01:25:42 +0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-05-27 03:58:16 +0000 |
| commit | 937cc8a64e5971def21303e7a19a4ad9553e0ace (patch) | |
| tree | 321543152e0c4d61e686ca7b92edd0d027bb168b /board/plankton | |
| parent | e216906c9327655d71b8758b7f11c2f744e55018 (diff) | |
| download | chrome-ec-937cc8a64e5971def21303e7a19a4ad9553e0ace.tar.gz | |
mec1322: Simplify GPIO lists
Our existing GPIO macros use port# / gpio#, but the concept of different
GPIO ports does not exist on the mec1322. Therefore, add new GPIO macros
for chips which do not have distinct GPIO ports.
BUG=None
BRANCH=None
TEST=make buildall -j
Change-Id: Ibda97c6563ad447d16dab39ecadab43ccb25174b
Signed-off-by: Steven Jian <steven.jian@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/262841
Reviewed-by: Anton Staaf <robotboy@chromium.org>
Diffstat (limited to 'board/plankton')
| -rw-r--r-- | board/plankton/gpio.inc | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/board/plankton/gpio.inc b/board/plankton/gpio.inc index 6ee250ebce..1f97b63fed 100644 --- a/board/plankton/gpio.inc +++ b/board/plankton/gpio.inc @@ -6,71 +6,71 @@ */ /* Inputs with interrupt handlers are first for efficiency */ -GPIO_INT(VBUS_WAKE, B, 5, GPIO_INT_BOTH, vbus_event) -GPIO_INT(DPSRC_HPD, B, 13, GPIO_INT_BOTH, hpd_event) -GPIO_INT(DBG_12V_TO_DUT_L, B, 14, GPIO_INT_FALLING, button_event) -GPIO_INT(DBG_5V_TO_DUT_L, B, 8, GPIO_INT_FALLING, button_event) -GPIO_INT(DBG_CHG_TO_DEV_L, F, 1, GPIO_INT_FALLING, button_event) -GPIO_INT(DBG_USB_TOGGLE_L, F, 0, GPIO_INT_FALLING, button_event) -GPIO_INT(DBG_CASE_CLOSE_EN_L, B, 12, GPIO_INT_FALLING, button_event) -GPIO_INT(DBG_MUX_FLIP_L, B, 15, GPIO_INT_FALLING, button_event) +GPIO_INT(VBUS_WAKE, PIN(B, 5), GPIO_INT_BOTH, vbus_event) +GPIO_INT(DPSRC_HPD, PIN(B, 13), GPIO_INT_BOTH, hpd_event) +GPIO_INT(DBG_12V_TO_DUT_L, PIN(B, 14), GPIO_INT_FALLING, button_event) +GPIO_INT(DBG_5V_TO_DUT_L, PIN(B, 8), GPIO_INT_FALLING, button_event) +GPIO_INT(DBG_CHG_TO_DEV_L, PIN(F, 1), GPIO_INT_FALLING, button_event) +GPIO_INT(DBG_USB_TOGGLE_L, PIN(F, 0), GPIO_INT_FALLING, button_event) +GPIO_INT(DBG_CASE_CLOSE_EN_L, PIN(B, 12), GPIO_INT_FALLING, button_event) +GPIO_INT(DBG_MUX_FLIP_L, PIN(B, 15), GPIO_INT_FALLING, button_event) /* TODO(crosbug.com/p/33761) : This interrupt is double booked w/ HPD */ -GPIO(DBG_20V_TO_DUT_L, C, 13, GPIO_INPUT) +GPIO(DBG_20V_TO_DUT_L, PIN(C, 13), GPIO_INPUT) /* PD RX/TX */ -GPIO(USBC_PD_REF, A, 1, GPIO_ANALOG) -GPIO(USBC_CC1_PD, A, 0, GPIO_ANALOG) -GPIO(USBC_CC1_TX_EN, A, 3, GPIO_OUT_LOW) -GPIO(USBC_CC2_PD, A, 4, GPIO_ANALOG) -GPIO(USBC_CC2_TX_EN, B, 2, GPIO_OUT_LOW) -GPIO(USBC_CC_TX_DATA, A, 6, GPIO_OUT_LOW) +GPIO(USBC_PD_REF, PIN(A, 1), GPIO_ANALOG) +GPIO(USBC_CC1_PD, PIN(A, 0), GPIO_ANALOG) +GPIO(USBC_CC1_TX_EN, PIN(A, 3), GPIO_OUT_LOW) +GPIO(USBC_CC2_PD, PIN(A, 4), GPIO_ANALOG) +GPIO(USBC_CC2_TX_EN, PIN(B, 2), GPIO_OUT_LOW) +GPIO(USBC_CC_TX_DATA, PIN(A, 6), GPIO_OUT_LOW) #if 0 /* Alternate functions */ -GPIO(USBC_TX_CLKOUT, B, 9, GPIO_OUT_LOW) -GPIO(USBC_TX_CLKIN, A, 5, GPIO_OUT_LOW) +GPIO(USBC_TX_CLKOUT, PIN(B, 9), GPIO_OUT_LOW) +GPIO(USBC_TX_CLKIN, PIN(A, 5), GPIO_OUT_LOW) #endif /* USB-C Power and muxes control */ -GPIO(USBC_CHARGE_EN, A, 8, GPIO_OUT_HIGH) -GPIO(USBC_CC1_DEVICE_ODL, A, 9, GPIO_OUT_LOW) -GPIO(USBC_CC1_HOST, A, 2, GPIO_INPUT) -GPIO(USBC_CC2_DEVICE_ODL, B, 7, GPIO_OUT_LOW) -GPIO(USBC_CC2_HOST, B, 6, GPIO_INPUT) -GPIO(USBC_POLARITY, B, 1, GPIO_OUT_HIGH) -GPIO(USBC_SS_USB_MODE, B, 3, GPIO_OUT_LOW) -GPIO(USB_CC1_VCONN_EN_L, A, 11, GPIO_OUT_HIGH) -GPIO(USB_CC2_VCONN_EN_L, A, 12, GPIO_OUT_HIGH) +GPIO(USBC_CHARGE_EN, PIN(A, 8), GPIO_OUT_HIGH) +GPIO(USBC_CC1_DEVICE_ODL, PIN(A, 9), GPIO_OUT_LOW) +GPIO(USBC_CC1_HOST, PIN(A, 2), GPIO_INPUT) +GPIO(USBC_CC2_DEVICE_ODL, PIN(B, 7), GPIO_OUT_LOW) +GPIO(USBC_CC2_HOST, PIN(B, 6), GPIO_INPUT) +GPIO(USBC_POLARITY, PIN(B, 1), GPIO_OUT_HIGH) +GPIO(USBC_SS_USB_MODE, PIN(B, 3), GPIO_OUT_LOW) +GPIO(USB_CC1_VCONN_EN_L, PIN(A, 11), GPIO_OUT_HIGH) +GPIO(USB_CC2_VCONN_EN_L, PIN(A, 12), GPIO_OUT_HIGH) -GPIO(VBUS_CHARGER_EN, B, 0, GPIO_OUT_LOW) +GPIO(VBUS_CHARGER_EN, PIN(B, 0), GPIO_OUT_LOW) /* VSEL_0/1: 0/0 = 5V, 1/0 = 12V, 1/1 = 20V */ -GPIO(USBC_VSEL_1, A, 10, GPIO_OUT_LOW) -GPIO(USBC_VSEL_0, C, 14, GPIO_OUT_LOW) +GPIO(USBC_VSEL_1, PIN(A, 10), GPIO_OUT_LOW) +GPIO(USBC_VSEL_0, PIN(C, 14), GPIO_OUT_LOW) /* Case closed debugging */ -GPIO(CASE_CLOSE_EN, A, 7, GPIO_OUT_LOW) -GPIO(CASE_CLOSE_DFU_L, A, 13, GPIO_OUT_HIGH) -GPIO(DEBUG_TOGGLE, B, 4, GPIO_OUT_LOW) +GPIO(CASE_CLOSE_EN, PIN(A, 7), GPIO_OUT_LOW) +GPIO(CASE_CLOSE_DFU_L, PIN(A, 13), GPIO_OUT_HIGH) +GPIO(DEBUG_TOGGLE, PIN(B, 4), GPIO_OUT_LOW) /* Alternate functions */ #if 0 -GPIO(UART_TX, A, 14, GPIO_OUT_LOW) -GPIO(UART_RX, A, 15, GPIO_OUT_LOW) +GPIO(UART_TX, PIN(A, 14), GPIO_OUT_LOW) +GPIO(UART_RX, PIN(A, 15), GPIO_OUT_LOW) #endif /* * I2C pins should be configured as inputs until I2C module is * initialized. This will avoid driving the lines unintentionally. */ -GPIO(MASTER_I2C_SCL, B, 10, GPIO_INPUT) -GPIO(MASTER_I2C_SDA, B, 11, GPIO_INPUT) +GPIO(MASTER_I2C_SCL, PIN(B, 10), GPIO_INPUT) +GPIO(MASTER_I2C_SDA, PIN(B, 11), GPIO_INPUT) /* Unimplemented signals which we need to emulate for now */ UNIMPLEMENTED(ENTERING_RW) UNIMPLEMENTED(WP_L) -ALTERNATE(A, 0x0020, 0, MODULE_USB_PD, 0) /* SPI1: SCK(PA5) */ -ALTERNATE(B, 0x0200, 2, MODULE_USB_PD, 0) /* TIM17_CH1: (PB9) */ -ALTERNATE(A, 0xC000, 1, MODULE_UART, 0) /* USART2: PA14/PA15 */ -ALTERNATE(B, 0x0C00, 1, MODULE_I2C, 0) /* I2C MASTER:PB10/11 */ +ALTERNATE(PIN_MASK(A, 0x0020), 0, MODULE_USB_PD, 0) /* SPI1: SCK(PA5) */ +ALTERNATE(PIN_MASK(B, 0x0200), 2, MODULE_USB_PD, 0) /* TIM17_CH1: (PB9) */ +ALTERNATE(PIN_MASK(A, 0xC000), 1, MODULE_UART, 0) /* USART2: PA14/PA15 */ +ALTERNATE(PIN_MASK(B, 0x0C00), 1, MODULE_I2C, 0) /* I2C MASTER:PB10/11 */ |