diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-06-11 08:57:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | 264727df3709c279eef05f501fdf592227fe6e01 (patch) | |
| tree | 078f2c01a302dbb24e1310818973d56a4c0e563f | |
| parent | d217a8f2a5e783a89508938934e3ca4238f64330 (diff) | |
| parent | 99d8a1732130a4254768bd0c2a228f3929cbc9ca (diff) | |
| download | olio-linux-3.10-264727df3709c279eef05f501fdf592227fe6e01.tar.xz olio-linux-3.10-264727df3709c279eef05f501fdf592227fe6e01.zip | |
Merge "Tiny changes makes a big difference - bluetooth sleep working" into android-3.10-bringup
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index d99fb863163..c0551e82502 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -53,7 +53,8 @@ /* */ /* off IRQ handle */ ti,pad_irq = <0x16e 90 1>, /* uart3 - serial rx */ - <0x9f6 143 1>; /* mpu6515 irq pin */ + <0x9f6 143 1>, /* mpu6515 irq pin */ + <0x9f4 123 1>; /* BT host wake */ }; }; |