summaryrefslogtreecommitdiff
path: root/board/discovery
diff options
context:
space:
mode:
authorSteven Jian <steven.jian@intel.com>2015-04-01 01:25:42 +0800
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-05-27 03:58:16 +0000
commit937cc8a64e5971def21303e7a19a4ad9553e0ace (patch)
tree321543152e0c4d61e686ca7b92edd0d027bb168b /board/discovery
parente216906c9327655d71b8758b7f11c2f744e55018 (diff)
downloadchrome-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/discovery')
-rw-r--r--board/discovery/gpio.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/board/discovery/gpio.inc b/board/discovery/gpio.inc
index bce256bef8..7f762017e3 100644
--- a/board/discovery/gpio.inc
+++ b/board/discovery/gpio.inc
@@ -6,14 +6,14 @@
*/
/* Inputs with interrupt handlers are first for efficiency */
-GPIO_INT(USER_BUTTON, A, 0, GPIO_INT_BOTH, button_event)
+GPIO_INT(USER_BUTTON, PIN(A, 0), GPIO_INT_BOTH, button_event)
/* Outputs */
-GPIO(LED_BLUE, B, 6, GPIO_OUT_LOW)
-GPIO(LED_GREEN, B, 7, GPIO_OUT_LOW)
+GPIO(LED_BLUE, PIN(B, 6), GPIO_OUT_LOW)
+GPIO(LED_GREEN, PIN(B, 7), GPIO_OUT_LOW)
/* Unimplemented signals which we need to emulate for now */
UNIMPLEMENTED(ENTERING_RW)
UNIMPLEMENTED(WP_L)
-ALTERNATE(A, 0x0600, GPIO_ALT_USART, MODULE_UART, 0)
+ALTERNATE(PIN_MASK(A, 0x0600), GPIO_ALT_USART, MODULE_UART, 0)