ARM: dts: imx6qdl-gw5910: add support for bcm4330-bt

The Sterling-LWB has a BCM4330 which has a UART based bluetooth
HCI. Add support for binding to the bcm_hci driver to take care
of handling the shutdown gpio and loading firmware.

Because the shutdown gpio is more of an enable than a regulator
go ahead and replace the regulator with a shutdown-gpio.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
index 30fe47ff64a40138e8c962201b93d39f72014639..b850f8f62970460fe40b3f5a7aaa02c6d86363a2 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
@@ -83,19 +83,6 @@
                regulator-max-microvolt = <3300000>;
                regulator-always-on;
        };
-
-       reg_bt: regulator-bt {
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_reg_bt>;
-               compatible = "regulator-fixed";
-               regulator-name = "bt";
-               gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;
-               startup-delay-us = <100>;
-               enable-active-high;
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               regulator-always-on;
-       };
 };
 
 
@@ -231,9 +218,14 @@
 /* Sterling-LWB Bluetooth */
 &uart4 {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart4>;
+       pinctrl-0 = <&pinctrl_uart4>,<&pinctrl_bten>;
        uart-has-rtscts;
        status = "okay";
+
+       bluetooth {
+               compatible = "brcm,bcm4330-bt";
+               shutdown-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+       };
 };
 
 /* GPS */
@@ -288,6 +280,12 @@
                >;
        };
 
+       pinctrl_bten: btengrp {
+               fsl,pins = <
+                       MX6QDL_PAD_GPIO_2__GPIO1_IO02           0x1b0b1
+               >;
+       };
+
        pinctrl_ecspi3: escpi3grp {
                fsl,pins = <
                        MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK      0x100b1
@@ -393,12 +391,6 @@
                >;
        };
 
-       pinctrl_reg_bt: regbtgrp {
-               fsl,pins = <
-                       MX6QDL_PAD_GPIO_2__GPIO1_IO02           0x1b0b1
-               >;
-       };
-
        pinctrl_reg_wl: regwlgrp {
                fsl,pins = <
                        MX6QDL_PAD_GPIO_5__GPIO1_IO05           0x1b0b1