summaryrefslogtreecommitdiff
path: root/board/daisy/board.c
diff options
context:
space:
mode:
authorDavid Hendricks <dhendrix@chromium.org>2012-04-23 17:30:51 -0700
committerDavid Hendricks <dhendrix@chromium.org>2012-05-02 10:41:59 -0700
commit653f6420f4491f1f41ce2dd5e5e0fb7f92ce80e6 (patch)
tree1c276e312a88dabb79aea6ba3067ac76453f7228 /board/daisy/board.c
parentcab258137b41e63c78d765883019a3b7c1540692 (diff)
downloadchrome-ec-653f6420f4491f1f41ce2dd5e5e0fb7f92ce80e6.tar.gz
daisy: EVT1 pin mapping
This modifies the existing daisy's board.c to use the new pin mapping. BUG=None TEST=Tested on Daisy-EVT1 Signed-off-by: David Hendricks <dhendrix@chromium.org> Change-Id: I717ce78df1ed29843d1498e979956c6ffdb05e80
Diffstat (limited to 'board/daisy/board.c')
-rw-r--r--board/daisy/board.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/board/daisy/board.c b/board/daisy/board.c
index ae1eb29a3e..a0ef122f45 100644
--- a/board/daisy/board.c
+++ b/board/daisy/board.c
@@ -42,10 +42,10 @@ void gaia_power_event(enum gpio_signal signal);
/* GPIO signal list. Must match order from enum gpio_signal. */
const struct gpio_info gpio_list[GPIO_COUNT] = {
/* Inputs with interrupt handlers are first for efficiency */
- {"KB_PWR_ON", GPIO_H, (1<<0), GPIO_INT_BOTH, gaia_power_event},
+ {"KB_PWR_ON", GPIO_B, (1<<5), GPIO_INT_BOTH, gaia_power_event},
{"PP1800_LDO2", GPIO_A, (1<<1), GPIO_INT_BOTH, gaia_power_event},
- {"XPSHOLD", GPIO_A, (1<<11), GPIO_INT_RISING, gaia_power_event},
- {"CHARGER_INT", GPIO_B, (1<<0), GPIO_INT_RISING, NULL},
+ {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_RISING, gaia_power_event},
+ {"CHARGER_INT", GPIO_C, (1<<4), GPIO_INT_RISING, NULL},
{"LID_OPEN", GPIO_C, (1<<13), GPIO_INT_BOTH, NULL},
{"KB_IN00", GPIO_C, (1<<8), GPIO_KB_INPUT, matrix_interrupt},
{"KB_IN01", GPIO_C, (1<<9), GPIO_KB_INPUT, matrix_interrupt},
@@ -60,14 +60,14 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
/* Outputs */
{"EN_PP1350", GPIO_A, (1<<2), GPIO_OUT_LOW, NULL},
- {"EN_PP5000", GPIO_A, (1<<3), GPIO_OUT_LOW, NULL},
+ {"EN_PP5000", GPIO_A, (1<<11), GPIO_OUT_LOW, NULL},
{"EN_PP3300", GPIO_A, (1<<8), GPIO_OUT_LOW, NULL},
{"PMIC_PWRON", GPIO_A, (1<<12), GPIO_OUT_HIGH, NULL},
- {"ENTERING_RW", GPIO_B, (1<<1), GPIO_OUT_LOW, NULL},
+ {"ENTERING_RW", GPIO_H, (1<<0), GPIO_OUT_LOW, NULL},
{"CHARGER_EN", GPIO_B, (1<<2), GPIO_OUT_LOW, NULL},
{"EC_INT", GPIO_B, (1<<9), GPIO_HI_Z, NULL},
{"CODEC_INT", GPIO_H, (1<<1), GPIO_HI_Z, NULL},
- {"KB_OUT00", GPIO_B, (1<<5), GPIO_KB_OUTPUT, NULL},
+ {"KB_OUT00", GPIO_B, (1<<0), GPIO_KB_OUTPUT, NULL},
{"KB_OUT01", GPIO_B, (1<<8), GPIO_KB_OUTPUT, NULL},
{"KB_OUT02", GPIO_B, (1<<12), GPIO_KB_OUTPUT, NULL},
{"KB_OUT03", GPIO_B, (1<<13), GPIO_KB_OUTPUT, NULL},
@@ -76,7 +76,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
{"KB_OUT06", GPIO_C, (1<<0), GPIO_KB_OUTPUT, NULL},
{"KB_OUT07", GPIO_C, (1<<1), GPIO_KB_OUTPUT, NULL},
{"KB_OUT08", GPIO_C, (1<<2), GPIO_KB_OUTPUT, NULL},
- {"KB_OUT09", GPIO_C, (1<<4), GPIO_KB_OUTPUT, NULL},
+ {"KB_OUT09", GPIO_B, (1<<1), GPIO_KB_OUTPUT, NULL},
{"KB_OUT10", GPIO_C, (1<<5), GPIO_KB_OUTPUT, NULL},
{"KB_OUT11", GPIO_C, (1<<6), GPIO_KB_OUTPUT, NULL},
{"KB_OUT12", GPIO_C, (1<<7), GPIO_KB_OUTPUT, NULL},