diff options
| author | Vic Yang <victoryang@chromium.org> | 2013-09-02 21:09:24 +0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2013-09-05 07:20:13 +0000 |
| commit | 0492ff9204a527b7cc9bbe84766d9507f52260a6 (patch) | |
| tree | 82987862b21405960e4f421e64f1f46ca480bcd7 /board | |
| parent | 4f09144839587a983aad85fa4c74fdda4eed1498 (diff) | |
| download | chrome-ec-0492ff9204a527b7cc9bbe84766d9507f52260a6.tar.gz | |
Temporary OTG and external power support
This is only for initial bringup that requires OTG to boot kernel. Note
that we are expecting firmware for USB ID detection and hardware change
to charger chip, so this is likely going to be thrown away.
BUG=chrome-os-partner:21964
TEST=Plug in OTG dongle and check VBUS voltage is ~5V
TEST=Unplug and check it's ~0V.
BRANCH=None
Change-Id: Iee66bef117188fea14a76459945be3bf5afef0dd
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/167832
Diffstat (limited to 'board')
| -rw-r--r-- | board/kirby/board.c | 9 | ||||
| -rw-r--r-- | board/kirby/board.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/board/kirby/board.c b/board/kirby/board.c index bea56ee462..87b3586877 100644 --- a/board/kirby/board.c +++ b/board/kirby/board.c @@ -32,16 +32,15 @@ const struct gpio_info gpio_list[] = { {"XPSHOLD", GPIO_E, (1<<5), GPIO_INT_RISING, gaia_power_event}, {"CHARGER_INT_L", GPIO_E, (1<<2), GPIO_INT_FALLING, NULL /*pmu_irq_handler*/}, - {"USB_CHG_INT", GPIO_E, (1<<15), GPIO_INT_RISING, - NULL /*extpower_interrupt*/}, + {"USB_CHG_INT", GPIO_E, (1<<15), GPIO_INT_FALLING, + extpower_interrupt}, {"USBPD_INT_L", GPIO_E, (1<<1), GPIO_INT_FALLING, NULL /*extpower_interrupt*/}, {"LID_OPEN", GPIO_E, (1<<6), GPIO_INT_BOTH, lid_interrupt}, {"SUSPEND_L", GPIO_E, (1<<3), GPIO_INT_BOTH, gaia_suspend_event}, {"SPI1_NSS", GPIO_A, (1<<4), GPIO_INT_BOTH | GPIO_PULL_UP, spi_event}, - {"AC_PRESENT_L", GPIO_A, (1<<1), GPIO_INT_BOTH, - NULL /*extpower_interrupt*/}, + {"AC_PRESENT_L", GPIO_A, (1<<1), GPIO_INT_BOTH, extpower_interrupt}, {"KB_IN00", GPIO_E, (1<<7), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt}, {"KB_IN01", GPIO_E, (1<<8), GPIO_KB_INPUT, @@ -64,7 +63,7 @@ const struct gpio_info gpio_list[] = { {"CHARGER_EN_L", GPIO_B, (1<<8), GPIO_OUT_HIGH, NULL}, {"EC_INT", GPIO_C, (1<<9), GPIO_ODR_HIGH, NULL}, {"EC_INT2", GPIO_B, (1<<4), GPIO_ODR_HIGH, NULL}, - {"ID_MUX", GPIO_B, (1<<11), GPIO_ODR_HIGH, NULL}, + {"ID_MUX", GPIO_B, (1<<11), GPIO_ODR_LOW, NULL}, {"BCHGR_OTG", GPIO_B, (1<<12), GPIO_OUT_LOW, NULL}, {"BCHGR_PSEL", GPIO_B, (1<<14), GPIO_OUT_LOW, NULL}, {"EN_PP3300", GPIO_C, (1<<11), GPIO_OUT_LOW, NULL}, diff --git a/board/kirby/board.h b/board/kirby/board.h index 7cd7c87218..24d14d6459 100644 --- a/board/kirby/board.h +++ b/board/kirby/board.h @@ -17,11 +17,13 @@ #define CONFIG_CHIPSET_GAIA #undef CONFIG_CHIPSET_HAS_PP1350 #undef CONFIG_CHIPSET_HAS_PP5000 +#define CONFIG_EXTPOWER_KIRBY #define CONFIG_HOST_COMMAND_STATUS #define CONFIG_I2C #define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_SPI #define CONFIG_PWM +#define CONFIG_USB_SWITCH_TSU6721 #ifndef __ASSEMBLER__ |