diff options
| author | Gerrit <chrome-bot@google.com> | 2012-05-02 14:32:51 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-05-02 14:32:51 -0700 |
| commit | 5ee635cf496dba60e67d0d68a8ee563d97df1b4a (patch) | |
| tree | 7768de196d7e0cedf6646e543511d850a45c67fd | |
| parent | b1ec950ccfbfb7804039592cf90d0e37071988d4 (diff) | |
| parent | 653f6420f4491f1f41ce2dd5e5e0fb7f92ce80e6 (diff) | |
| download | chrome-ec-5ee635cf496dba60e67d0d68a8ee563d97df1b4a.tar.gz | |
Merge "daisy: EVT1 pin mapping"
| -rw-r--r-- | board/daisy/board.c | 14 |
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}, |