MLK-11738 dts: mx6ul: add Murata BT/WiFi module support for 9x9 evk

Add Murata Type ZP module support for 9x9 evk.

Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
(cherry picked from commit 26e76b8d1fcae367e7a16ba5a4a399a8116f3d5e)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b07fd6b..6e74e04 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -456,6 +456,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
        imx6ul-14x14-ddr3-arm2-wm8958.dtb \
        imx6ul-14x14-lpddr2-arm2.dtb \
        imx6ul-9x9-evk.dtb \
+       imx6ul-9x9-evk-btwifi.dtb \
        imx6ul-9x9-evk-csi.dtb \
        imx6ul-9x9-evk-ldo.dtb
 dtb-$(CONFIG_SOC_IMX7D) += \

diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk-btwifi.dts b/arch/arm/boot/dts/imx6ul-14x14-evk-btwifi.dts
index 97a21dc..4613799 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-14x14-evk-btwifi.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk-btwifi.dts
@@ -6,46 +6,5 @@
  * published by the Free Software Foundation.
  */
 
-/*
- * NOTE: This DTS file is written for plugging in Murata Wi-Fi/BT EVK into Slot
- * SD1 and using Murata i.MX InterConnect Ver 2.0 Adapter. Bluetooth UART &
- * control signals are connected via ribbon cable (J1701 connector).
- */
-
 #include "imx6ul-14x14-evk.dts"
-
-/ {
-       regulators {
-               wlreg_on: fixedregulator@100 {
-                       compatible = "regulator-fixed";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-name = "wlreg_on";
-                       gpio = <&gpio5 1 0>;
-                       startup-delay-us = <100>;
-                       enable-active-high;
-               };
-       };
-
-       bcmdhd_wlan_0: bcmdhd_wlan@0 {
-               compatible = "android,bcmdhd_wlan";
-               wlreg_on-supply = <&wlreg_on>;
-       };
-};
-
-&iomuxc {
-       imx6ul-evk-murata-v2 {
-               pinctrl_wifi: wifigrp {
-                       fsl,pins = <
-                               MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x03029
-                       >;
-               };
-       };
-};
-
-&usdhc1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_wifi>;
-       no-1-8-v;
-       wifi-host; /* add hook for SD card detect mechanism for BCMDHD driver */
-};
+#include "imx6ul-evk-btwifi.dtsi"

diff --git a/arch/arm/boot/dts/imx6ul-9x9-evk-btwifi.dts b/arch/arm/boot/dts/imx6ul-9x9-evk-btwifi.dts
new file mode 100644 (file)
index 0000000..de89052
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ul-9x9-evk-btwifi.dts
@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 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 "imx6ul-9x9-evk.dts"
+#include "imx6ul-evk-btwifi.dtsi"

diff --git a/arch/arm/boot/dts/imx6ul-evk-btwifi.dtsi b/arch/arm/boot/dts/imx6ul-evk-btwifi.dtsi
new file mode 100644 (file)
index 0000000..51e8bbd
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ul-evk-btwifi.dtsi
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 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.
+ */
+
+/*
+ * NOTE: This DTS file is written for plugging in Murata Wi-Fi/BT EVK into Slot
+ * SD1 and using Murata i.MX InterConnect Ver 2.0 Adapter. Bluetooth UART &
+ * control signals are connected via ribbon cable (J1701 connector).
+ */
+
+/ {
+       regulators {
+               wlreg_on: fixedregulator@100 {
+                       compatible = "regulator-fixed";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       regulator-name = "wlreg_on";
+                       gpio = <&gpio5 1 0>;
+                       startup-delay-us = <100>;
+                       enable-active-high;
+               };
+       };
+
+       bcmdhd_wlan_0: bcmdhd_wlan@0 {
+               compatible = "android,bcmdhd_wlan";
+               wlreg_on-supply = <&wlreg_on>;
+       };
+};
+
+&iomuxc {
+       imx6ul-evk-murata-v2 {
+               pinctrl_wifi: wifigrp {
+                       fsl,pins = <
+                               MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x03029
+                       >;
+               };
+       };
+};
+
+&usdhc1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_wifi>;
+       no-1-8-v;
+       wifi-host; /* add hook for SD card detect mechanism for BCMDHD driver */
+};