diff options
| author | mattis fjallstrom <mattis@acm.org> | 2016-04-28 19:54:36 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2016-04-28 19:55:30 -0700 |
| commit | 104bd36ed2d86c77a2d6949d3957a6c014c70f72 (patch) | |
| tree | ba0f71798333cb197daf97a274f8186eb4798aa1 /arch/arm/boot | |
| parent | e165e8cc62e787316ebf36322481b64312c37e0b (diff) | |
| download | olio-linux-3.10-104bd36ed2d86c77a2d6949d3957a6c014c70f72.tar.xz olio-linux-3.10-104bd36ed2d86c77a2d6949d3957a6c014c70f72.zip | |
Removing code that enabled/disabled interrupts as a result of power management notifications, fixing pinmux and reading status register twice (per tps69510 TRM).
Change-Id: Idaac043ebe18229333bb7c090865e9ca3804f189
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index 7c3b4ebd314..41b52faec8e 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -101,7 +101,7 @@ <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 */ + <0x1b0 23 1>; /* sys_nirq / gpio 0 - rtc alarm */ }; sound { @@ -181,7 +181,8 @@ 0x0f2 0x11c /* CAM_D6, MODE4 | INPUT_PULLUP */ 0x5ba 0x004 /* ETK_D7, MODE4 | OUTPUT (from GL susp) */ - 0x1b0 0xc100 /* SYS_NIRQ, MODE0 | INPUT | OFFWAKEUP */ + + 0x1b0 0x4118 /* 0xc100 SYS_NIRQ, MODE0 | INPUT | OFFWAKEUP */ 0x0dc 0x004 /* CAM_HS, MODE4 | OUTPUT */ |