diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-07-25 17:01:18 -0700 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2015-07-25 17:01:18 -0700 |
| commit | b84e453fe0ff5aa369fc0e8b370cc58000466f69 (patch) | |
| tree | 0d38dc93e2a1304a291ff96e815430e7ca01cc02 | |
| parent | 93ea70523c1af608008961f079b6ccc364db1079 (diff) | |
| parent | 5be344bb73c581f32b38b143b21c7ffd9ac13072 (diff) | |
| download | olio-linux-3.10-b84e453fe0ff5aa369fc0e8b370cc58000466f69.tar.xz olio-linux-3.10-b84e453fe0ff5aa369fc0e8b370cc58000466f69.zip | |
Merge branch 'android-3.10-bringup' of ssh://internal.oliodevices.com:29418/kernel/omap into android-3.10-bringup
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index e01633412a5..5f200367193 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -75,8 +75,7 @@ /* listed below will be reported as the wakeup reason */ /* */ /* off IRQ handle */ - ti,pad_irq = <0x150 88 1>, /* uart1 - BT input */ - <0x16e 90 0>, /* uart3 - serial rx */ + ti,pad_irq = <0x152 88 1>, /* uart1 - BT input */ <0x9f6 143 1>, /* mpu6515 irq pin - is this offset correct? */ <0x9f4 123 1>, /* BT host wake */ <0x1b0 23 1>; /* sys_nirq */ |