MLK-11728-01 dts: imx6: add Murata BT module support

Since commit:76946e805b5d don't set murata bt/wifi as default in dtb, to align
with this commit, firstly revert the previous murata BT support patch, and then
add bt support in imx6*-btwifi.dts.

Revert "MLK-11694 ARM: dts: imx6x: add Murata BT ZP (bcm4339) module support"
This reverts commit 117ba2ebb3fdf537379268786d5626cbe4b4799b.
Conflicts:
	arch/arm/boot/dts/Makefile

Signed-off-by: Fugang Duan <B38611@freescale.com>

6 files changed, 29 insertions, 71 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7a24c828fbd0..710bb5f70702 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -161,7 +161,6 @@ dtb-$(CONFIG_ARCH_MXC) += \
 	imx6dl-sabreauto-gpmi-weim.dtb \
 	imx6dl-sabresd.dtb \
 	imx6dl-sabresd-btwifi.dtb \
-	imx6dl-sabresd-ecspi1.dtb \
 	imx6dl-sabresd-enetirq.dtb \
 	imx6dl-sabresd-ldo.dtb \
 	imx6dl-sabresd-pf200.dtb \
@@ -180,17 +179,16 @@ dtb-$(CONFIG_ARCH_MXC) += \
 	imx6qp-sabreauto-gpmi-weim.dtb \
 	imx6qp-sabresd.dtb \
 	imx6qp-sabresd-btwifi.dtb \
-	imx6qp-sabresd-ecspi1.dtb \
 	imx6qp-sabresd-ldo.dtb \
 	imx6qp-sabresd-hdcp.dtb \
+	imx6qp-sabresd-uart.dtb \
 	imx6q-sabrelite.dtb \
 	imx6q-sabresd.dtb \
 	imx6q-sabresd-btwifi.dtb \
-	imx6q-sabresd-ecspi1.dtb \
 	imx6q-sabresd-enetirq.dtb \
 	imx6q-sabresd-ldo.dtb \
 	imx6q-sabresd-hdcp.dtb \
-	imx6q-sabresd-ldo.dtb \
+	imx6q-sabresd-uart.dtb \
 	imx6q-sbc6x.dtb \
 	imx6q-udoo.dtb \
 	imx6q-wandboard.dtb \
diff --git a/arch/arm/boot/dts/imx6dl-sabresd-ecspi1.dts b/arch/arm/boot/dts/imx6dl-sabresd-ecspi1.dts
deleted file mode 100644
index 8353371a1098..000000000000
--- a/arch/arm/boot/dts/imx6dl-sabresd-ecspi1.dts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Freescale Semiconductor, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include "imx6dl-sabresd.dts"
-
-/ {
-	leds {
-		status = "okay";
-	};
-};
-
-&ecspi1 {
-	status = "okay";
-};
-
-&uart5 {
-	status = "disabled";
-};
diff --git a/arch/arm/boot/dts/imx6q-sabresd-ecspi1.dts b/arch/arm/boot/dts/imx6q-sabresd-uart.dts
index 1e33ff7be086..67437312e42a 100644
--- a/arch/arm/boot/dts/imx6q-sabresd-ecspi1.dts
+++ b/arch/arm/boot/dts/imx6q-sabresd-uart.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Freescale Semiconductor, Inc.
+ * Copyright (C) 2014 Freescale Semiconductor, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -10,14 +10,21 @@
 
 / {
 	leds {
-		status = "okay";
+		compatible = "gpio-leds";
+		status = "disabled";
 	};
 };
 
-&ecspi1 {
+&uart5 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart5_1>;
+	fsl,uart-has-rtscts;
 	status = "okay";
+	/* for DTE mode, add below change */
+	/* fsl,dte-mode; */
+	/* pinctrl-0 = <&pinctrl_uart5dte_1>; */
 };
 
-&uart5 {
+&ecspi1 {
 	status = "disabled";
 };
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 24b010a4e979..df76622f1b95 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -47,7 +47,6 @@
 
 	leds {
 		compatible = "gpio-leds";
-		status = "disabled";
 
 		charger-led {
 			gpios = <&gpio1 2 0>;
@@ -282,7 +281,7 @@
 	cs-gpios = <&gpio4 9 0>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_ecspi1>;
-	status = "disabled";
+	status = "okay";
 
 	flash: m25p80@0 {
 		#address-cells = <1>;
@@ -924,16 +923,6 @@
 	status = "okay";
 };
 
-&uart5 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_uart5_1>;
-	fsl,uart-has-rtscts;
-	status = "okay";
-	/* for DTE mode, add below change */
-	/* fsl,dte-mode; */
-	/* pinctrl-0 = <&pinctrl_uart5dte_1>; */
-};
-
 &usbh1 {
 	vbus-supply = <&reg_usb_h1_vbus>;
 	status = "okay";
diff --git a/arch/arm/boot/dts/imx6qp-sabresd-ecspi1.dts b/arch/arm/boot/dts/imx6qp-sabresd-uart.dts
index 2cfccd6c2db7..d855aaeb86bd 100644
--- a/arch/arm/boot/dts/imx6qp-sabresd-ecspi1.dts
+++ b/arch/arm/boot/dts/imx6qp-sabresd-uart.dts
@@ -10,14 +10,21 @@
 
 / {
 	leds {
-		status = "okay";
+		compatible = "gpio-leds";
+		status = "disabled";
 	};
 };
 
 &ecspi1 {
-	status = "okay";
+	status = "disabled";
 };
 
 &uart5 {
-	status = "disabled";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart5_1>;
+	fsl,uart-has-rtscts;
+	status = "okay";
+	/* for DTE mode, add below change */
+	/* fsl,dte-mode; */
+	/* pinctrl-0 = <&pinctrl_uart5dte_1>; */
 };
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
index a1246d8d493b..10b594fdf457 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
@@ -430,14 +430,6 @@
 	status = "okay";
 };
 
-&uart3 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_uart3
-		     &pinctrl_bt>;
-	fsl,uart-has-rtscts;
-	status = "okay";
-};
-
 &uart5 { /* for bluetooth */
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart5>;
@@ -475,7 +467,7 @@
 &usdhc2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc2>;
-	bus-width = <1>;  /* MUX SDIO for 1-bit only. */
+	non-removable;
 	no-1-8-v;
 	keep-power-in-suspend;
 	enable-sdio-wakeup;
@@ -493,7 +485,7 @@
 	keep-power-in-suspend;
 	enable-sdio-wakeup;
 	vmmc-supply = <&vcc_sd3>;
-	status = "disabled";
+	status = "okay";
 };
 
 &usdhc4 {
@@ -740,12 +732,6 @@
 			>;
 		};
 
-		pinctrl_bt: btgrp {
-			fsl,pins = <
-				MX6SX_PAD_SD2_DATA3__GPIO6_IO_11	0x13069 /* BT_REG_ON */
-			>;
-		};
-
 		pinctrl_canfd1: canfd1grp-1 {
 			fsl,pins = <
 				MX6SX_PAD_QSPI1B_DQS__CANFD_TX1         0x1b0b0
@@ -998,15 +984,6 @@
 			>;
 		};
 
-		pinctrl_uart3: uart3grp {
-			fsl,pins = <
-				MX6SX_PAD_SD3_DATA4__UART3_RX		0x1b0b1
-				MX6SX_PAD_SD3_DATA5__UART3_TX		0x1b0b1
-				MX6SX_PAD_SD3_DATA7__UART3_CTS_B	0x1b0b1
-				MX6SX_PAD_SD3_DATA6__UART3_RTS_B	0x1b0b1
-			>;
-		};
-
 		pinctrl_uart5: uart5grp {
 			fsl,pins = <
 				MX6SX_PAD_KEY_ROW3__UART5_RX		0x1b0b1
@@ -1048,6 +1025,9 @@
 				MX6SX_PAD_SD2_CMD__USDHC2_CMD		0x17059
 				MX6SX_PAD_SD2_CLK__USDHC2_CLK		0x10059
 				MX6SX_PAD_SD2_DATA0__USDHC2_DATA0	0x17059
+				MX6SX_PAD_SD2_DATA1__USDHC2_DATA1	0x17059
+				MX6SX_PAD_SD2_DATA2__USDHC2_DATA2	0x17059
+				MX6SX_PAD_SD2_DATA3__USDHC2_DATA3	0x17059
 			>;
 		};