diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-06-11 06:13:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | d217a8f2a5e783a89508938934e3ca4238f64330 (patch) | |
| tree | a0ee49022872359dbfd8d3e925607d824d85c612 | |
| parent | d5d16dd5d85cd65569fe141cffb0733a9148938a (diff) | |
| parent | 57469e595bc2bc356259482a55397d450a83f5e7 (diff) | |
| download | olio-linux-3.10-d217a8f2a5e783a89508938934e3ca4238f64330.tar.xz olio-linux-3.10-d217a8f2a5e783a89508938934e3ca4238f64330.zip | |
Merge "First stab at BT pins correct with Devicetree" into android-3.10-bringup
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 9 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1-bluetooth.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index cb3c67b1713..d99fb863163 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -141,9 +141,13 @@ 0x186 0x100 /* HSUSB0_DATA6, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ 0x188 0x100 /* HSUSB0_DATA7, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ - /* pin for waking up bluetooth chip, settings from uboot */ + /* pin for controlling bluetooth chip, settings from uboot */ 0x1aa 0x004 /* CONTROL_PADCONF_MCSPI2_SOMI, (IDIS | PI | M4 ) */ + /* BT_WAKE_GPIO - for waking up BT */ + /* OMAP_OFF_ENABLE and OMAP_OFF_PULL_EN for sleep modes. */ + 0x0da 0x1204 /* DSS_DATA23, (IDIS | PI | M4 ) */ + /* Accelerometer interrupt */ /* 0x9f6 0x4104 */ /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | OMAP_PIN_OFF_WAKEUPENABLE */ @@ -178,6 +182,9 @@ 0x006 0x008 /* SYS_CLKREQ, MODE0 | PULLDOWN */ 0x018 0x000 /* SYS_OFF_MODE, MODE0 */ 0x01a 0x10c /* SYS_CLKOUT1, MODE4 | INPUT_PULLDOWN */ + /* Wakeup from Bluetooth */ + /* 0x024 0x4104 */ /* JTAG_EMU0, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | + OMAP_PIN_OFF_WAKEUPENABLE */ /* Accelerometer interrupt */ 0x026 0x4104 /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | OMAP_PIN_OFF_WAKEUPENABLE */ diff --git a/arch/arm/mach-omap2/board-omap3h1-bluetooth.c b/arch/arm/mach-omap2/board-omap3h1-bluetooth.c index 642ded4811c..3cec4bee656 100644 --- a/arch/arm/mach-omap2/board-omap3h1-bluetooth.c +++ b/arch/arm/mach-omap2/board-omap3h1-bluetooth.c @@ -337,7 +337,7 @@ int bcm4430_bluetooth_suspend(struct platform_device *pdev, pm_message_t state) int host_wake; disable_irq(irq); - host_wake = gpio_get_value(BT_HOST_WAKE_GPIO); + host_wake = gpio_get_value(BT_HOST_WAKE_GPIO); /* Never goes low - what's up? */ if (host_wake) { enable_irq(irq); |