diff options
| author | Chenjie Luo <cjluo@google.com> | 2016-04-19 18:15:50 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2016-04-19 18:15:50 +0000 |
| commit | 8be7ccd29dcad96164f738a80b1162568eba62fe (patch) | |
| tree | f78bb4b3c43dc06639b1b65d5d53204b766e1a84 | |
| parent | dbba005ad8af680302389c072658a5c0c7c032d5 (diff) | |
| parent | 149ae81a9fd03446325e1e203af30a6cd4f75fe0 (diff) | |
Merge "Revert "Enable Nitrous BT power management driver."" into android-msm-sturgeon-3.10-emerald-leandroid-wear-6.0.1_r0.17
| -rw-r--r-- | arch/arm/boot/dts/apq8026-sturgeon/apq8026-sturgeon-bcm.dtsi | 23 | ||||
| -rw-r--r-- | arch/arm/mach-msm/Makefile | 2 | ||||
| -rw-r--r-- | drivers/bluetooth/Makefile | 2 |
3 files changed, 15 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/apq8026-sturgeon/apq8026-sturgeon-bcm.dtsi b/arch/arm/boot/dts/apq8026-sturgeon/apq8026-sturgeon-bcm.dtsi index a2ede9857621..0ad5ad33e9a5 100644 --- a/arch/arm/boot/dts/apq8026-sturgeon/apq8026-sturgeon-bcm.dtsi +++ b/arch/arm/boot/dts/apq8026-sturgeon/apq8026-sturgeon-bcm.dtsi @@ -11,6 +11,16 @@ */ &soc { + qcom,bluesleep { + compatible = "qcom,bluesleep"; + host-wake-gpio = <&msmgpio 64 0>; + ext-wake-gpio = <&msmgpio 63 0>; + interrupt-parent = <&msmgpio>; + interrupts = <64 0>; + interrupt-names = "host_wake"; + tx-timer-interval = <1>; + }; + /*high speed uart,for BT*/ hserial:serial@f9920000 { compatible = "qcom,msm-hsuart-v14"; @@ -29,21 +39,14 @@ qcom,bam-tx-ep-pipe-index = <6>; qcom,bam-rx-ep-pipe-index = <7>; + qcom,rx-char-to-inject = <0xFD>; + qcom,msm-bus,name = "blsp1_uart3"; qcom,msm-bus,num-cases = <2>; + qcom,msm-bus,active-only = <0>; qcom,msm-bus,num-paths = <1>; qcom,msm-bus,vectors-KBps = <86 512 0 0>, <86 512 500 800>; }; - - bt_nitrous { - compatible = "goog,nitrous"; - uart-port = <0>; - power-gpio = <&msmgpio 67 0>; - host-wake-gpio = <&msmgpio 64 0>; - host-wake-polarity = <0>; - dev-wake-gpio = <&msmgpio 63 0>; - dev-wake-polarity = <0>; - }; }; diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 70d165946472..70af9e899d96 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -34,7 +34,7 @@ obj-$(CONFIG_ARCH_MDM9630) += board-9630.o board-9630-gpiomux.o obj-$(CONFIG_MSM_PP2S_FEMTO) += pp2s.o obj-$(CONFIG_ARCH_MSMFERRUM) += board-ferrum.o obj-$(CONFIG_ARCH_MSM8916) += board-8916.o -obj-$(CONFIG_ARCH_MSM8226) += board-8226.o board-8226-gpiomux.o board-8226-gpiomcu.o +obj-$(CONFIG_ARCH_MSM8226) += board-8226.o board-8226-gpiomux.o board-8226-rfkill.o board-8226-gpiomcu.o obj-$(CONFIG_ARCH_MSM8226) += clock-8226.o clock-mdss-8974.o obj-$(CONFIG_ARCH_MSM8610) += board-8610.o board-8610-gpiomux.o obj-$(CONFIG_ARCH_MSM8610) += clock-8610.o diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile index b5976a716a07..39b1a904ac46 100644 --- a/drivers/bluetooth/Makefile +++ b/drivers/bluetooth/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_BT_HCIDTL1) += dtl1_cs.o obj-$(CONFIG_BT_HCIBT3C) += bt3c_cs.o obj-$(CONFIG_BT_HCIBLUECARD) += bluecard_cs.o obj-$(CONFIG_BT_HCIBTUART) += btuart_cs.o -obj-$(CONFIG_BRCM_BT_SLEEP) += nitrous.o +obj-$(CONFIG_BRCM_BT_SLEEP) += bluesleep.o obj-$(CONFIG_BT_HCIBTUSB) += btusb.o obj-$(CONFIG_BT_HCIBTSDIO) += btsdio.o |