From: Kuibao Zhang <kuibao.zhang@amlogic.com>
Date: Mon, 22 Jan 2018 07:20:35 +0000 (+0800)
Subject: dts: fix 8.1 r311 bt open fail
X-Git-Tag: khadas-vims-v0.9.6-release~2572
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f31ad4a47a5cdc6af4c5c5c1bccfa8b5dda3119;p=platform%2Fkernel%2Flinux-amlogic.git

dts: fix 8.1 r311 bt open fail

PD#159307: BT fix 8.1 r311 bt open fail
1.DTS,change bt en pin
2.FIX bt en pinmux

Change-Id: I59c5978a5b52b49f9aa1aeede93d2761bca62959
Signed-off-by: Kuibao Zhang <kuibao.zhang@amlogic.com>
---

diff --git a/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi b/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi
index b9cc2642..27a2af0 100644
--- a/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi
@@ -911,8 +911,7 @@
 	};
 	hdmitx_aocecb: ao_cecb {
 		mux {
-			groups = "ao_cec_b_ao7",
-				"ao_cec_b_ao8";
+			groups = "ao_cec_b_ao7";
 			function = "ao_cec_b";
 		};
 	};
diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index 3440661..03ef729 100644
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -596,7 +596,7 @@
 		compatible = "amlogic, bt-dev";
 		dev_name = "bt-dev";
 		status = "okay";
-		gpio_reset = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
+		gpio_reset = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;
 		//gpio_en = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;
 	};