From: 陈亮 <cl@rock-chips.com>
Date: Fri, 15 Aug 2014 06:49:07 +0000 (-0700)
Subject: rk312x-sdk: modify adc key adc_value and power key gpio
X-Git-Tag: firefly_0821_release~4880
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ee50487b0d487cf14913b8d16b9c2a3831c51717;p=firefly-linux-kernel-4.4.55.git

rk312x-sdk: modify adc key adc_value and power key gpio

Signed-off-by: 陈亮 <cl@rock-chips.com>
---

diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts
index 151e9b5a1bea..0a9c90dc473b 100755
--- a/arch/arm/boot/dts/rk3126-sdk.dts
+++ b/arch/arm/boot/dts/rk3126-sdk.dts
@@ -53,6 +53,12 @@
 
 &key {
 		io-channels = <&adc 2>;
+		power-key {
+			gpios = <&gpio1 GPIO_A4 GPIO_ACTIVE_LOW>;
+			linux,code = <116>;
+			label = "power";
+			gpio-key,wakeup;
+		};
 };
 &sdmmc {
 	cd-gpios = <&gpio2 GPIO_A3 GPIO_ACTIVE_HIGH>;/*CD GPIO*/
diff --git a/arch/arm/boot/dts/rk3128-sdk.dts b/arch/arm/boot/dts/rk3128-sdk.dts
index 51d39748b2a6..dc5dd1f9285b 100755
--- a/arch/arm/boot/dts/rk3128-sdk.dts
+++ b/arch/arm/boot/dts/rk3128-sdk.dts
@@ -54,3 +54,11 @@
 &sdmmc {
 	cd-gpios = <&gpio1 GPIO_C1 GPIO_ACTIVE_HIGH>;/*CD GPIO*/
 };
+&key {
+		power-key {
+			gpios = <&gpio0 GPIO_A2 GPIO_ACTIVE_LOW>;
+			linux,code = <116>;
+			label = "power";
+			gpio-key,wakeup;
+		};
+};
diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
index 199a8f4aa836..923f2aff6e29 100755
--- a/arch/arm/boot/dts/rk312x-sdk.dtsi
+++ b/arch/arm/boot/dts/rk312x-sdk.dtsi
@@ -120,13 +120,13 @@
 		vol-up-key {
 			linux,code = <115>;
 			label = "volume up";
-			rockchip,adc_value = <327>;
+			rockchip,adc_value = <523>;
 		};
 
 		vol-down-key {
 			linux,code = <114>;
 			label = "volume down";
-			rockchip,adc_value = <426>;
+			rockchip,adc_value = <727>;
 		};
 
 		power-key {
@@ -145,13 +145,13 @@
 		home-key {
 			linux,code = <102>;
 			label = "home";
-			rockchip,adc_value = <746>;
+			rockchip,adc_value = <318>;
 		};
 
 		back-key {
 			linux,code = <158>;
 			label = "back";
-			rockchip,adc_value = <103>;
+			rockchip,adc_value = <146>;
 		};
 
 		camera-key {