diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-08-11 20:05:58 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-08-11 20:06:34 -0700 |
| commit | 828496eb80e97b7dbd4921ad64b1799ba2e5dd5b (patch) | |
| tree | 3accafab470e063df54a08bde52a6062e562d467 /arch/arm/boot/dts/omap3_h1.dts | |
| parent | a25960e811a1aa56814deed47e257c1cddc90084 (diff) | |
| parent | 9ccd6e0d99208ca9a7bb514cc956b1de6800940b (diff) | |
| download | olio-linux-3.10-828496eb80e97b7dbd4921ad64b1799ba2e5dd5b.tar.xz olio-linux-3.10-828496eb80e97b7dbd4921ad64b1799ba2e5dd5b.zip | |
Merge branch 'mindtribe_dev' into android-3.10-bringup
Conflicts:
arch/arm/boot/dts/omap3_h1.dts
drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_trigger.c
Both resolved.
Change-Id: I42c070961bff246b07179dcaae1fc784dddb0328
Diffstat (limited to 'arch/arm/boot/dts/omap3_h1.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index ff0ed298de7..b8c949698ae 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 = <0x150 88 1>, /* uart1 - BT input */ + 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 */ @@ -148,7 +148,7 @@ 0x19c 0x118 /* MCSPI1_SOMI, MODE0 | INPUT_PULLUP */ 0x1a0 0x000 /* MCSPI1_CS1, MODE0 | OUTPUT */ - /* CKE pin for memory */ + /* CKE pin for memory */ 0x232 0x000 /* SDRC_CKE0, MODE0 | OUTPUT */ 0x234 0x000 /* SDRC_CKE1, MODE0 | OUTPUT */ @@ -194,14 +194,14 @@ OMAP_PIN_OFF_WAKEUPENABLE */ 0x14c 0x000 /* UART1, BT, TX */ - 0x14e 0x000 /* UART1, BT, RTS - E00 = output high off */ + 0x14e 0xA00 /* UART1, BT, RTS - A00 = output off high, this one is active low! */ 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 ) */ + 0x0da 0x004 /* 0x1604 */ /* DSS_DATA23, (IDIS | PI | M4 ) */ >; }; |