diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-08-05 06:25:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | 905802fa542d99e1e517d6a9cfbdb24824b3651b (patch) | |
| tree | 518a3c59c48fe5d8341c2c2ab178d76787e0f960 /arch/arm/mach-omap2/board-omap3h1.c | |
| parent | 818daae7bec16f8e5ed436f1bc79e79f30467e89 (diff) | |
| parent | de3d691b61a9302d3284d790a630d720a906753b (diff) | |
| download | olio-linux-3.10-905802fa542d99e1e517d6a9cfbdb24824b3651b.tar.xz olio-linux-3.10-905802fa542d99e1e517d6a9cfbdb24824b3651b.zip | |
Merge changes I061a6a86,Id3696474 into android-3.10-bringup
* changes:
Adding timed wakelock to the charger irq, so it has time to notify Android
The charger now works off of an IRQ, instead of scheduling every minute.
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3h1.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 6f089952c8f..06b150f4956 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -79,6 +79,7 @@ #define TPS_SYS_NIRQ 0 #define USB_IRQ 124 #define USB_CS 17 +#define CHG_GPOUT 10 #define DEFAULT_RXDMA_POLLRATE 1 /* RX DMA polling rate (us) */ #define DEFAULT_RXDMA_BUFSIZE 4096 /* RX DMA buffer size */ @@ -397,6 +398,10 @@ static int __init omap3_h1_i2c_init(void) omap3h1_i2c1_board_info[1].irq = acc_irq; #endif +#if defined (CONFIG_MACH_OMAP3_H1_PV) + omap3h1_i2c2_board_info[4].irq = gpio_to_irq(CHG_GPOUT); +#endif + gpio_request_one(USB_CS, GPIOF_OUT_INIT_HIGH, "USB on"); /* Register buses */ |