From ada5e4edb5330076979d38f6ebdc28054e1ccfe2 Mon Sep 17 00:00:00 2001
From: Jianhui Wang <wjh@rock-chips.com>
Date: Fri, 13 Mar 2020 18:57:04 +0800
Subject: [PATCH] ARM: dts: rockchip: add adc key config for rk3288-evb board

Change-Id: Iab3c08291e6c13be9a66276c72b631c050d0df88
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
---
 arch/arm/boot/dts/rk3288-android.dtsi | 52 ---------------------------
 arch/arm/boot/dts/rk3288-evb.dtsi     | 19 +++++-----
 2 files changed, 10 insertions(+), 61 deletions(-)

diff --git a/arch/arm/boot/dts/rk3288-android.dtsi b/arch/arm/boot/dts/rk3288-android.dtsi
index 3be8f1df58e9..2244e7d09665 100644
--- a/arch/arm/boot/dts/rk3288-android.dtsi
+++ b/arch/arm/boot/dts/rk3288-android.dtsi
@@ -206,58 +206,6 @@
 		};
 	};
 
-	rk_key: rockchip-key {
-		compatible = "rockchip,key";
-		status = "okay";
-
-		io-channels = <&saradc 1>;
-
-		vol-up-key {
-			linux,code = <115>;
-			label = "volume up";
-			rockchip,adc_value = <1>;
-		};
-
-		vol-down-key {
-			linux,code = <114>;
-			label = "volume down";
-			rockchip,adc_value = <170>;
-		};
-
-		power-key {
-			gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
-			linux,code = <116>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pwrbtn>;
-			label = "power";
-			gpio-key,wakeup;
-		};
-
-		menu-key {
-			linux,code = <59>;
-			label = "menu";
-			rockchip,adc_value = <355>;
-		};
-
-		home-key {
-			linux,code = <102>;
-			label = "home";
-			rockchip,adc_value = <746>;
-		};
-
-		back-key {
-			linux,code = <158>;
-			label = "back";
-			rockchip,adc_value = <560>;
-		};
-
-		camera-key {
-			linux,code = <212>;
-			label = "camera";
-			rockchip,adc_value = <450>;
-		};
-	};
-
 	nandc0: nandc@ff400000 {
 		compatible = "rockchip,rk-nandc";
 		reg = <0x0 0xff400000 0x0 0x4000>;
diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index 0f9b4f7556e2..80af382528a6 100644
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -48,33 +48,34 @@
 		io-channels = <&saradc 1>;
 		io-channel-names = "buttons";
 		keyup-threshold-microvolt = <1800000>;
+		poll-interval = <100>;
 
-		button-up {
-			label = "Volume Up";
+		vol-up-key {
+			label = "volume up";
 			linux,code = <KEY_VOLUMEUP>;
-			press-threshold-microvolt = <100000>;
+			press-threshold-microvolt = <1000>;
 		};
 
-		button-down {
-			label = "Volume Down";
+		vol-down-key {
+			label = "volume down";
 			linux,code = <KEY_VOLUMEDOWN>;
-			press-threshold-microvolt = <300000>;
+			press-threshold-microvolt = <170000>;
 		};
 
 		menu {
-			label = "Menu";
+			label = "menu";
 			linux,code = <KEY_MENU>;
 			press-threshold-microvolt = <640000>;
 		};
 
 		esc {
-			label = "Esc";
+			label = "esc";
 			linux,code = <KEY_ESC>;
 			press-threshold-microvolt = <1000000>;
 		};
 
 		home  {
-			label = "Home";
+			label = "home";
 			linux,code = <KEY_HOME>;
 			press-threshold-microvolt = <1300000>;
 		};