From: wuliangqing <wlq@rock-chips.com>
Date: Fri, 4 Nov 2016 01:36:52 +0000 (+0800)
Subject: arm64: dts: rk3399-vr: enable rk_headset on rk3399 vr
X-Git-Tag: firefly_0821_release~1323
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8ea1c3c569fe576c642a77b7c89ca3ca978ebac6;p=firefly-linux-kernel-4.4.55.git

arm64: dts: rk3399-vr: enable rk_headset on rk3399 vr

Change-Id: I4e078c586e6654c3a4711d0b0108d28360db9453
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
---

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
index 88931fec436a..ad8d9b2692cc 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
@@ -289,6 +289,14 @@
 			rockchip,adc_value = <780>;
 		};
 	};
+
+	rk_headset {
+		compatible = "rockchip_headset";
+		headset_gpio = <&gpio4 28 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&hp_det>;
+		io-channels = <&saradc 2>;
+	};
 };
 
 &cluster0_opp {
@@ -799,7 +807,6 @@
 		clocks = <&cru SCLK_I2S_8CH_OUT>;
 		clock-names = "mclk";
 		spk-con-gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
-		hp-det-gpio = <&gpio4 28 GPIO_ACTIVE_LOW>;
 	};
 };
 
@@ -1124,4 +1131,10 @@
 			rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
+
+	headphone {
+		hp_det: hp-det {
+			rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
 };