diff options
| author | Anton Staaf <robotboy@chromium.org> | 2016-02-22 10:53:33 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-02-22 23:50:52 -0800 |
| commit | 0a644a91250671bb20a7815105ec532b42da19c1 (patch) | |
| tree | a6871aa61a82970b8cf716c7a64c6d0f3fc73705 /board/strago | |
| parent | 74615c1011382d930f3c4be72ec043ad35856b95 (diff) | |
| download | chrome-ec-0a644a91250671bb20a7815105ec532b42da19c1.tar.gz | |
GPIO: Move definitions of GPIO_KB_INPUT and OUTPUT
Previously these were often done in board.c files, which made it
impossible to include the gpio.inc anywhere else. As part of
refactoring the GPIO code we now need to be able to include gpio.inc
from common/gpio.c. Moving these defines into gpio.inc makes them
available wherever gpio.inc is included.
Signed-off-by: Anton Staaf <robotboy@chromium.org>
BRANCH=None
BUG=None
TEST=make buildall -j
Change-Id: I28e7b5a1d40b113ae824b18f020b2d1e51e0c08a
Reviewed-on: https://chromium-review.googlesource.com/328822
Commit-Ready: Anton Staaf <robotboy@chromium.org>
Tested-by: Anton Staaf <robotboy@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'board/strago')
| -rw-r--r-- | board/strago/board.c | 4 | ||||
| -rw-r--r-- | board/strago/gpio.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/board/strago/board.c b/board/strago/board.c index 97d5b77dde..6f49040a9f 100644 --- a/board/strago/board.c +++ b/board/strago/board.c @@ -44,10 +44,6 @@ #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) #define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args) -#define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP) -#define GPIO_KB_OUTPUT (GPIO_ODR_HIGH) -#define GPIO_KB_OUTPUT_COL2 (GPIO_OUT_LOW) - /* Exchange status with PD MCU. */ static void pd_mcu_interrupt(enum gpio_signal signal) { diff --git a/board/strago/gpio.inc b/board/strago/gpio.inc index 9eaf13e783..2ca293e6be 100644 --- a/board/strago/gpio.inc +++ b/board/strago/gpio.inc @@ -28,6 +28,10 @@ GPIO_INT(PCH_SLP_S3_L, PIN(206), GPIO_INT_BOTH, power_ UNIMPLEMENTED(BAT_PRESENT_L) UNIMPLEMENTED(USB_PD_WAKE) +#define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP) +#define GPIO_KB_OUTPUT (GPIO_ODR_HIGH) +#define GPIO_KB_OUTPUT_COL2 (GPIO_OUT_LOW) + GPIO(NC_GPIO0, PIN(0), GPIO_INPUT | GPIO_PULL_UP) /* NC */ GPIO(KBD_KSO2, PIN(1), GPIO_KB_OUTPUT_COL2) /* Negative edge triggered irq. */ |