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/dingdong | |
| 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/dingdong')
| -rw-r--r-- | board/dingdong/gpio.inc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/board/dingdong/gpio.inc b/board/dingdong/gpio.inc index 9dc31bea66..c6ba602448 100644 --- a/board/dingdong/gpio.inc +++ b/board/dingdong/gpio.inc @@ -5,26 +5,26 @@ * found in the LICENSE file. */ -GPIO_INT(DP_HPD, A, 0, GPIO_INT_BOTH, hpd_event) +GPIO_INT(DP_HPD, PIN(A, 0), GPIO_INT_BOTH, hpd_event) -GPIO(USB_C_CC1_PD, A, 1, GPIO_ANALOG) -GPIO(STM_READY, A, 2, GPIO_OUT_LOW) /* factory test only */ -GPIO(PD_DAC_REF, A, 4, GPIO_ANALOG) -GPIO(DP_AUX_N, A, 5, GPIO_INPUT) -GPIO(DP_AUX_P, A, 6, GPIO_INPUT) +GPIO(USB_C_CC1_PD, PIN(A, 1), GPIO_ANALOG) +GPIO(STM_READY, PIN(A, 2), GPIO_OUT_LOW) /* factory test only */ +GPIO(PD_DAC_REF, PIN(A, 4), GPIO_ANALOG) +GPIO(DP_AUX_N, PIN(A, 5), GPIO_INPUT) +GPIO(DP_AUX_P, PIN(A, 6), GPIO_INPUT) -GPIO(PD_SBU_ENABLE, A, 8, GPIO_OUT_LOW) -GPIO(USB_DM, A, 11, GPIO_ANALOG) -GPIO(USB_DP, A, 12, GPIO_ANALOG) -GPIO(PD_CC1_TX_EN, A, 15, GPIO_OUT_LOW) +GPIO(PD_SBU_ENABLE, PIN(A, 8), GPIO_OUT_LOW) +GPIO(USB_DM, PIN(A, 11), GPIO_ANALOG) +GPIO(USB_DP, PIN(A, 12), GPIO_ANALOG) +GPIO(PD_CC1_TX_EN, PIN(A, 15), GPIO_OUT_LOW) -GPIO(PD_DPSINK_PRESENT, B, 0, GPIO_INPUT) -GPIO(PD_CC1_TX_DATA, B, 4, GPIO_OUT_LOW) +GPIO(PD_DPSINK_PRESENT, PIN(B, 0), GPIO_INPUT) +GPIO(PD_CC1_TX_DATA, PIN(B, 4), GPIO_OUT_LOW) /* Unimplemented signals which we need to emulate for now */ UNIMPLEMENTED(ENTERING_RW) UNIMPLEMENTED(WP_L) -ALTERNATE(B, 0x0008, 0, MODULE_USB_PD, 0) /* SPI1: SCK(PB3) */ -ALTERNATE(B, 0x0200, 2, MODULE_USB_PD, 0) /* TIM17_CH1: PB9 */ -ALTERNATE(A, 0x0600, 1, MODULE_UART, GPIO_PULL_UP) /* USART1: PA9/PA10 */ +ALTERNATE(PIN_MASK(B, 0x0008), 0, MODULE_USB_PD, 0) /* SPI1: SCK(PB3) */ +ALTERNATE(PIN_MASK(B, 0x0200), 2, MODULE_USB_PD, 0) /* TIM17_CH1: PB9 */ +ALTERNATE(PIN_MASK(A, 0x0600), 1, MODULE_UART, GPIO_PULL_UP) /* USART1: PA9/PA10 */ |