diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-06-09 17:00:58 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-06-09 17:00:58 -0700 |
| commit | b11040f05c83130c51d49782691ea37bc02b59f5 (patch) | |
| tree | c412c97cc7c9014b94f2dc6b9f980406ae9169c3 | |
| parent | bb90aba3439775f08fe1289fbb40dee85624c398 (diff) | |
| download | olio-linux-3.10-b11040f05c83130c51d49782691ea37bc02b59f5.tar.xz olio-linux-3.10-b11040f05c83130c51d49782691ea37bc02b59f5.zip | |
Making bluetooth work with the updated kernel and sleep modes.
Change-Id: Ia4cdf405b77b0219e9e7d76a1ae2691b607235c3
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 16 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1-bluetooth.c | 5 |
2 files changed, 16 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index eeecb84bc80..cb3c67b1713 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -141,12 +141,23 @@ 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 */ + 0x1aa 0x004 /* CONTROL_PADCONF_MCSPI2_SOMI, (IDIS | PI | M4 ) */ + /* Accelerometer interrupt */ /* 0x9f6 0x4104 */ /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | OMAP_PIN_OFF_WAKEUPENABLE */ >; }; + uart1_pins: pinmux_uart1_pins { + pinctrl-single,pins = < + /* uart1 */ + 0x152 0x118 /* UART1_RX, MODEO | (uboot: ien, pullup, m0 */ + 0x146 0x000 /* UART1_TX, MODE0 | OUTPUT, MODE0 */ + >; + }; + uart3_pins: pinmux_uart3_pins { pinctrl-single,pins = < /* uart3 */ @@ -214,7 +225,7 @@ }; -#if 0 +#if 0 /* Not currently used */ &i2c1 { /* clock-frequency = <400000>; */ /* PMIC ONLY */ @@ -272,7 +283,8 @@ #endif &uart1 { - status = "disabled"; + pinctrl-0 = <&uart1_pins>; + pinctrl-names = "default"; }; &uart2 { diff --git a/arch/arm/mach-omap2/board-omap3h1-bluetooth.c b/arch/arm/mach-omap2/board-omap3h1-bluetooth.c index 52bf419b549..642ded4811c 100644 --- a/arch/arm/mach-omap2/board-omap3h1-bluetooth.c +++ b/arch/arm/mach-omap2/board-omap3h1-bluetooth.c @@ -43,7 +43,6 @@ static void update_host_wake_locked(int); #define BT_REG_GPIO 180 - #define BT_WAKE_GPIO 93 #define BT_HOST_WAKE_GPIO 11 @@ -102,12 +101,12 @@ static void set_wake_locked(int wake) if (!wake) wake_unlock(&bt_lpm.wake_lock); - if (!wake_uart_enabled && wake) + //if (!wake_uart_enabled && wake) //omap_uart_enable(2); gpio_set_value(BT_WAKE_GPIO, wake); - if (wake_uart_enabled && !wake) + //if (wake_uart_enabled && !wake) //omap_uart_disable(2); wake_uart_enabled = wake; |