diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-08-04 23:38:04 -0700 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2015-08-04 23:38:04 -0700 |
| commit | c196c1d6cdcccb97a89d61be519db5db5fdad51e (patch) | |
| tree | df94d4fc203d4e576c44216b0c693ab04548d8f7 /arch/arm/boot | |
| parent | 905802fa542d99e1e517d6a9cfbdb24824b3651b (diff) | |
| parent | b13b7246a4b40ab53ec22d33e935d25c8ee8d1fc (diff) | |
| download | olio-linux-3.10-c196c1d6cdcccb97a89d61be519db5db5fdad51e.tar.xz olio-linux-3.10-c196c1d6cdcccb97a89d61be519db5db5fdad51e.zip | |
Merge remote-tracking branch 'olio/mindtribe_dev' into android-3.10-bringup
Change-Id: Ib628ec8c5402bdaec5cc4924f674ba1c38206993
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index 481ec5e1976..a12cf478222 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -75,7 +75,7 @@ /* listed below will be reported as the wakeup reason */ /* */ /* off IRQ handle */ - ti,pad_irq = <0x152 88 1>, /* uart1 - BT input */ + ti,pad_irq = <0x150 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 */ @@ -179,11 +179,6 @@ 0x1a8 0x004 /* CONTROL_PADCONF_MCSPI2_SIMO, (IDIS | PI | M4 ) */ 0x1aa 0x004 /* CONTROL_PADCONF_MCSPI2_SOMI, (IDIS | PI | M4 ) */ - /* BT_WAKE_GPIO - for waking up BT */ - /* OMAP_OFF_ENABLE, OMAP_OFF_PULL_EN, OMAP_OFF_OUTENABLE for sleep modes. */ - /* Now set this to regular old output */ - 0x0da 0x004 /* 0x1604 */ /* DSS_DATA23, (IDIS | PI | M4 ) */ - /* UART3 pins */ 0x16e 0x100 /* RX, input, off wake up */ 0x170 0x000 /* TX, output */ @@ -198,10 +193,15 @@ /* 0x9f6 0x4104 */ /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | OMAP_PIN_OFF_WAKEUPENABLE */ - 0x14c 0x000 /* UART1, BT, TX */ - 0x14e 0x000 /* UART1, BT, RTS */ - 0x150 0x4100 /* UART1, BT, CTS */ - 0x152 0x100 /* UART1, BT, RX */ + 0x14c 0x000 /* UART1, BT, TX */ + 0x14e 0x000 /* UART1, BT, RTS - E00 = output high off */ + 0x150 0x4100 /* UART1, BT, CTS */ + 0x152 0x100 /* UART1, BT, RX */ + + /* BT_WAKE_GPIO - for waking up BT */ + /* OMAP_OFF_ENABLE, OMAP_OFF_PULL_EN, OMAP_OFF_OUTENABLE for sleep modes. */ + /* Now set this to regular old output .. also off enable, output low. (0x600) */ + 0x0da 0x604 /* 0x1604 */ /* DSS_DATA23, (IDIS | PI | M4 ) */ >; }; |