From 0969aee07b0cc9ca6b3ed64e76b58ac5e19d9af2 Mon Sep 17 00:00:00 2001 From: Leonard Crestez Date: Fri, 23 Feb 2018 18:28:08 +0200 Subject: 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 --- arch/arm/boot/dts/imx6ul-14x14-evk-btwifi.dts | 43 +-------------------------- 1 file changed, 1 insertion(+), 42 deletions(-) (limited to 'arch/arm/boot/dts/imx6ul-14x14-evk-btwifi.dts') diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk-btwifi.dts b/arch/arm/boot/dts/imx6ul-14x14-evk-btwifi.dts index 97a21dc54f6a..4613799a97c7 100644 --- 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" -- cgit v1.2.3