diff options
| author | Fugang Duan <b38611@freescale.com> | 2015-10-19 11:11:13 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:23:32 +0800 |
| commit | 97c4dd253ba0ff7054e330202bb6e422e6cc94fb (patch) | |
| tree | 36714f714677d8985d749c53a10fc83e1d6890d9 /arch/arm/boot/dts/imx6qdl-sabresd-btwifi.dtsi | |
| parent | bf362cb6d8df5c2a0253c18de6e42449c2e9fddb (diff) | |
MLK-11728-02 ARM: dts: imx6x: add Murata BT support
The patch re-enable Murata BT as commit 117ba2ebb3fd define.
Since commit:76946e805b5d don't set murata bt/wifi as default in dtb and
add extra dts file to support Murata BT/WIFI, to align with this commit,
move BT support in the extra dts file.
Signed-off-by: Fugang Duan <B38611@freescale.com>
Conflicts:
arch/arm/boot/dts/imx6q-sabresd-uart.dts
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-sabresd-btwifi.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-sabresd-btwifi.dtsi | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd-btwifi.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd-btwifi.dtsi index c2c305a6a27d..d4c0569b5385 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd-btwifi.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd-btwifi.dtsi @@ -40,6 +40,10 @@ }; }; +&ecspi1 { + status = "disabled"; +}; + &iomuxc { imx6qdl-sabresd-murata-v2 { /* add MUXing entry for SD2 4-bit interface and configure control pins */ @@ -57,6 +61,16 @@ }; }; +&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>; */ +}; + &usdhc2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wifi>; |