summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorKe Qinghua <qinghua.ke@freescale.com>2014-06-26 11:26:59 +0800
committerKe Qinghua <qinghua.ke@freescale.com>2014-06-26 11:26:59 +0800
commitd76fe19625d8ca09fe8e524c7105b511072f4ee6 (patch)
treed9292b102dee73e2624e47868415b203155389e3 /arch
parent66e9e31f6b36c034763d0ae4b7001d36b590f4d7 (diff)
ENGR00305254 imx6sx sarbesd board bring up
Enable BT for imx6sx SD board Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6sx-sdb.dts6
-rw-r--r--arch/arm/boot/dts/imx6sx.dtsi2
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
index 27b469c898d6..9c58768aafa8 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
@@ -145,6 +145,12 @@
compatible = "fsl,imx6sx-csi-v4l2", "fsl,imx6sl-csi-v4l2";
status = "okay";
};
+
+ bt_rfkill {
+ compatible = "fsl,mxc_bt_rfkill";
+ bt-power-gpios = <&gpio4 10 0>;
+ status = "okay";
+ };
};
&csi1 {
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index c2fd174f4372..2549b361c706 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -1373,7 +1373,7 @@
MX6SX_PAD_NAND_DATA03__RAWNAND_DATA03 0xb0b1
MX6SX_PAD_NAND_DATA04__RAWNAND_DATA04 0xb0b1
MX6SX_PAD_NAND_DATA05__RAWNAND_DATA05 0xb0b1
- MX6SX_PAD_NAND_DATA06__RAWNAND_DATA06 0xb0b1
+ MX6SX_PAD_NAND_DATA06__GPIO4_IO_10 0x1b0b0
MX6SX_PAD_NAND_DATA07__RAWNAND_DATA07 0xb0b1
>;
};