ARM: dts: imx6sx-udoo-neo: add bluetooth config to uart3

This updates the WL1831 bluetooth to use the serial serdev driver
interface.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
index cc9994e7d833ca9d3ddd28e37b901fed0def8ea6..5817b498539106c28b4577726dba551dfad1b18a 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
@@ -20,3 +20,7 @@ memory@80000000 {
 &i2c4 { /* Onboard Motion sensors */
        status = "okay";
 };
+
+&uart3 { /* Bluetooth */
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
index 12e802f6208a4242e2683c9f969ed9465431cd17..96f4d89848a3c9aa1cd6d05569db5df1ad39636b 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
@@ -35,3 +35,7 @@ ethphy1: ethernet-phy@0 {
 &i2c4 { /* Onboard Motion sensors */
        status = "okay";
 };
+
+&uart3 { /* Bluetooth */
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
index 1c3362dfb97a760ab8b64ff1cb479c64d51542f0..25d4aa985a69444774d75941b764aa31e616ad7b 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
@@ -70,18 +70,6 @@ reg_wlan: regulator-wlan {
                startup-delay-us = <70000>;
                enable-active-high;
        };
-
-       reg_bt: regulator-bt {
-               compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_bt_reg>;
-               enable-active-high;
-               gpio = <&gpio2 17 GPIO_ACTIVE_HIGH>;
-               regulator-name = "bt_reg";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               regulator-always-on;
-       };
 };
 
 &fec1 {
@@ -343,11 +331,19 @@ &uart2 {
        status = "disabled";
 };
 
-&uart3 { /* Bluetooth */
+&uart3 { /* Bluetooth - only on Extended/Full versions */
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart3>;
        uart-has-rtscts;
-       status = "okay";
+       status = "disabled";
+
+       bluetooth {
+               compatible = "ti,wl1831-st";
+               enable-gpios = <&gpio2 17 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_bt_reg>;
+               max-speed = <921600>;
+       };
 };
 
 /* Arduino serial */