From: zhangjun <zhangjun@rock-chips.com>
Date: Tue, 11 Oct 2016 06:46:10 +0000 (+0800)
Subject: arm64: dts: rockchip: enable rk_headset on rk3399 mid
X-Git-Tag: firefly_0821_release~1335
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=6e28ffac2be11d2bdbe2a35469fc2e4947b67ab0

arm64: dts: rockchip: enable rk_headset on rk3399 mid

Change-Id: I8ef75283727152e7c5fa7380813296bc7220ed91
Signed-off-by: zhangjun <zhangjun@rock-chips.com>
---

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
index 70f5273b2865..0ff962cc3afd 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
@@ -251,6 +251,14 @@
 		vibrator-gpio = <&gpio4 30 GPIO_ACTIVE_LOW>;
 		status = "okay";
 	};
+
+	rk_headset {
+		compatible = "rockchip_headset";
+		headset_gpio = <&gpio4 28 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&hp_det>;
+		io-channels = <&saradc 2>;
+	};
 };
 
 &dfi {
@@ -839,12 +847,9 @@
 		#sound-dai-cells = <0>;
 		compatible = "everest,es8316";
 		reg = <0x11>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&hp_det>;
 		clocks = <&cru SCLK_I2S_8CH_OUT>;
 		clock-names = "mclk";
 		spk-con-gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
-		hp-det-gpio = <&gpio4 28 GPIO_ACTIVE_HIGH>;
 	};
 };