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/boot/dts/omap3_h1.dts | |
| 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/boot/dts/omap3_h1.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index 5f200367193..481ec5e1976 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -77,6 +77,7 @@ /* off IRQ handle */ ti,pad_irq = <0x152 88 1>, /* uart1 - BT input */ <0x9f6 143 1>, /* mpu6515 irq pin - is this offset correct? */ + <0x9ea 122 1>, /* bq27400 chg irq8 */ <0x9f4 123 1>, /* BT host wake */ <0x1b0 23 1>; /* sys_nirq */ }; @@ -232,7 +233,8 @@ pinctrl-single,pins = < 0x006 0x008 /* SYS_CLKREQ, MODE0 | PULLDOWN */ 0x018 0x000 /* SYS_OFF_MODE, MODE0 */ - 0x01a 0x10c /* SYS_CLKOUT1, MODE4 | INPUT_PULLDOWN */ + /* Fuel gauge interrupt */ + 0x01a 0x4104 /* SYS_CLKOUT1, MODE4 | OMAP_PIN_INPUT */ /* Wakeup from Bluetooth */ 0x024 0x410C /* JTAG_EMU0, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | |