diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-06-16 23:02:06 -0700 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2015-06-16 23:02:06 -0700 |
| commit | 7b64f89746ec8f5cc5df7acb1c2dfd0bdecfb3dc (patch) | |
| tree | 03eade239c714205666ef702a1ea3a50bf8d6d93 | |
| parent | 194820aa9b8fae661e14e9a96158814645a61f62 (diff) | |
| parent | e258d749a567c41f8ee1780e4f4e3d5d62b7501e (diff) | |
| download | olio-linux-3.10-7b64f89746ec8f5cc5df7acb1c2dfd0bdecfb3dc.tar.xz olio-linux-3.10-7b64f89746ec8f5cc5df7acb1c2dfd0bdecfb3dc.zip | |
Merge branch 'evan-bt-wake' of ssh://internal.oliodevices.com:29418/kernel/omap into evan-bt-wakeevan-bt-wake
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index 5d3f0f2f315..d9633598521 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -149,9 +149,13 @@ /* BT_WAKE_GPIO - for waking up BT */ /* OMAP_OFF_ENABLE, OMAP_OFF_PULL_EN, OMAP_OFF_OUTENABLE for sleep modes. */ 0x0da 0x1604 /* DSS_DATA23, (IDIS | PI | M4 ) */ + + /* UART3 pins */ + 0x16e 0x4100 /* RX, input, off wake up */ + 0x170 0x000 /* TX, output */ + /* BT_HOST_WAKE */ /*0x9f4 0x4104 */ /* JTAG_EMU0 , (OMAP_MUX_MODE4 | OMAP_PIN_INPUT | OMAP_WAKEUPENABLE) */ - /* Accelerometer interrupt */ /*0x9f6 0x4104 */ /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | OMAP_PIN_OFF_WAKEUPENABLE */ @@ -175,6 +179,7 @@ /* Accelerometer interrupt */ 0x026 0x4104 /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | OMAP_PIN_OFF_WAKEUPENABLE */ + >; }; }; |