Merge "Revert "Enable Nitrous BT power management driver."" into android-msm-sturgeon-3.10-emerald-le
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 a2ede98..0ad5ad33 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 70d1659..70af9e89 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -34,7 +34,7 @@
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 b5976a7..39b1a90 100644
--- a/drivers/bluetooth/Makefile
+++ b/drivers/bluetooth/Makefile
@@ -11,7 +11,7 @@
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
