tree b1400746ffcf68c7f0800cb1f491825aff940028
parent 92cb3c4fac922029c4fe759fba2a78becb137e7a
author Fugang Duan <b38611@freescale.com> 1445222629 +0800
committer Fugang Duan <b38611@freescale.com> 1445231435 +0800

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>