summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authormattis fjallstrom <mattis@acm.org>2016-01-11 19:43:00 -0800
committermattis fjallstrom <mattis@acm.org>2016-01-11 19:43:00 -0800
commitadacad29a479dff5c4959e11f59ed2623faa455a (patch)
treee82e7daff2a96945997f2e249925ab37c2594001 /arch/arm
parent9177138cf02829830c8d0003815bcff3c8c6b866 (diff)
downloadolio-linux-3.10-adacad29a479dff5c4959e11f59ed2623faa455a.tar.xz
olio-linux-3.10-adacad29a479dff5c4959e11f59ed2623faa455a.zip
Enable/disable fuel gauge wake up depending on charge state. This turns off interrupts from the fuel gauge while charging.
Change-Id: I6a004c9d6ae9f47eae69387f27534f63c77ebfcf
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/omap3_h1.dts26
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts
index ee19b23f0cc..d162d465c8b 100644
--- a/arch/arm/boot/dts/omap3_h1.dts
+++ b/arch/arm/boot/dts/omap3_h1.dts
@@ -68,7 +68,7 @@
* for a gpio IRQ (banks numbered 1 to 6)
* irq = 16 + 96 + (gpio_bank - 1) * 32 + GPIO no.
*/
- compatible = "ti,pad-wkup";
+ compatible = "ti,pad-wkup";
/* Map the pad offset (off) to an interrupt (IRQ). */
/* if handle is 1, an irq will be generated based on */
@@ -83,10 +83,10 @@
/* off IRQ handle */
ti,pad_irq = <0x150 88 1>, /* 72 + 16, 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 */
+ <0x9f6 143 1>, /* mpu6515 irq pin - is this offset correct? */
+ /* <0x9ea 122 1>, */ /* bq27400 chg irq8 - needed here? */
+ <0x9f4 123 1>, /* BT host wake */
+ <0x1b0 23 1>; /* sys_nirq */
};
sound {
@@ -215,14 +215,14 @@
>;
};
- dev_pins: pinmux_pv_pins {
- pinctrl-single,pins = <
- 0x5b2 0x204 /* USB control, ETK_D3, MODE4 | OUTPUT */
- /* 0x1a2 0x104 */ /* ALS interrupt, input, GPIO */
- 0x086 0x004 /* DRV2605 vibrator, output, GPIO */
- /* 0x938 0x104 */ /* Battery state, input, GPIO */
- >;
- };
+dev_pins: pinmux_pv_pins {
+ pinctrl-single,pins = <
+ 0x5b2 0x204 /* USB control, ETK_D3, MODE4 | OUTPUT */
+ /* 0x1a2 0x104 */ /* ALS interrupt, input, GPIO */
+ 0x086 0x004 /* DRV2605 vibrator, output, GPIO */
+ /* 0x938 0x104 */ /* Battery state, input, GPIO */
+ >;
+ };
/*
i2c1_pins: pinmux_i2c1_pins {