From c5fda54b3c428ecc262309614e8f4968429e678f Mon Sep 17 00:00:00 2001
From: wuliangqing <wlq@rock-chips.com>
Date: Fri, 7 Oct 2016 18:29:05 +0800
Subject: [PATCH] arm64: dts: rk3399-vr: redefine vr key

Change-Id: I15134f71acb93613702f21959857f85c3a3e49dc
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
---
 .../boot/dts/rockchip/rk3399-vr-android.dts   | 104 ++++++++++--------
 1 file changed, 60 insertions(+), 44 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
index ea3321ac2f4c..874251dd6113 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
@@ -233,6 +233,62 @@
 		rockchip,uboot-charge-on = <0>;
 		rockchip,android-charge-on = <1>;
 	};
+
+	rk_vr_key: rockchip-vr-key {
+		compatible = "rockchip,key";
+		status = "okay";
+
+		io-channels = <&saradc 1>;
+
+		vol-down-key {
+			linux,code = <114>;
+			label = "volume down";
+			rockchip,adc_value = <170>;
+		};
+
+		vol-up-key {
+			linux,code = <115>;
+			label = "volume up";
+			rockchip,adc_value = <340>;
+		};
+
+		home-key {
+			linux,code = <102>;
+			label = "home";
+			rockchip,adc_value = <420>;
+		};
+
+		camera-key {
+			linux,code = <212>;
+			label = "camera";
+			rockchip,adc_value = <520>;
+		};
+
+		power-key {
+			gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+			linux,code = <116>;
+			label = "power";
+			gpio-key,wakeup;
+		};
+
+		back-key {
+			linux,code = <158>;
+			label = "back";
+			rockchip,adc_value = <620>;
+		};
+
+		n-key {
+			linux,code = <102>;
+			label = "n";
+			rockchip,adc_value = <700>;
+		};
+
+		menu-key {
+			linux,code = <59>;
+			label = "menu";
+			rockchip,adc_value = <780>;
+		};
+	};
 };
 
 &cluster0_opp {
@@ -838,50 +894,6 @@
 	status = "okay";
 };
 
-&rk_key {
-	compatible = "rockchip,key";
-	status = "okay";
-	io-channels = <&saradc 1>;
-
-	vol-up-key {
-		linux,code = <115>;
-		label = "volume up";
-		rockchip,adc_value = <340>;
-	};
-
-	vol-down-key {
-		linux,code = <114>;
-		label = "volume down";
-		rockchip,adc_value = <170>;
-	};
-
-	power-key {
-		gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
-		linux,code = <116>;
-		label = "power";
-		gpio-key,wakeup;
-	};
-
-	back-key {
-		linux,code = <158>;
-		label = "back";
-		rockchip,adc_value = <620>;
-	};
-
-	n-key {
-		linux,code = <102>;
-		label = "n";
-		rockchip,adc_value = <700>;
-	};
-
-	menu-key {
-		linux,code = <59>;
-		label = "menu";
-		rockchip,adc_value = <780>;
-	};
-
-};
-
 &u2phy0 {
 	extcon = <&fusb0>;
 	status = "okay";
@@ -970,6 +982,10 @@
 	rockchip,pwm_voltage = <900000>;
 };
 
+&rk_key {
+	status = "disabled";
+};
+
 &rk_screen {
 	assigned-clocks = <&cru PLL_VPLL>;
 	assigned-clock-rates = <245000000>;
-- 
2.34.1