From: Wenping Zhang <wenping.zhang@rock-chips.com>
Date: Mon, 26 Jun 2017 08:59:11 +0000 (+0800)
Subject: ARM: dts: rockchip: add power key support on gva sdk board.
X-Git-Tag: release-20171130_firefly~4^2~306
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e00cd145128000114bf68f7023d77ef5e2087806;p=firefly-linux-kernel-4.4.55.git

ARM: dts: rockchip: add power key support on gva sdk board.

Change-Id: I10046d4369fad752b76e3dc518aab2c714e37eb6
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
---

diff --git a/arch/arm/boot/dts/rk3229-gva-sdk.dts b/arch/arm/boot/dts/rk3229-gva-sdk.dts
index ce65cb98585f..e6ff5764eb37 100644
--- a/arch/arm/boot/dts/rk3229-gva-sdk.dts
+++ b/arch/arm/boot/dts/rk3229-gva-sdk.dts
@@ -114,6 +114,10 @@
 	status = "disabled";
 };
 
+&power_key {
+	gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;
+};
+
 &i2c0 {
 	status = "okay";
 
@@ -264,6 +268,12 @@
 };
 
 &pinctrl {
+	keys {
+		pwr_key: pwr-key {
+			rockchip,pins = <1 18 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+	};
+
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins = <1 12 RK_FUNC_GPIO &pcfg_pull_up>; /* gpio1_b4 */
@@ -281,7 +291,6 @@
 			rockchip,pins = <3 20 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
-
 };
 
 &sdio {
@@ -291,6 +300,10 @@
 	assigned-clock-parents = <&xin24m>;
 };
 
+&sdmmc {
+	status = "disabled";
+};
+
 &u2phy0_host {
 	phy-supply = <&vcc_host>;
 };
diff --git a/arch/arm/boot/dts/rk322x-android.dtsi b/arch/arm/boot/dts/rk322x-android.dtsi
index eceda348da7e..211fcdd8cf30 100644
--- a/arch/arm/boot/dts/rk322x-android.dtsi
+++ b/arch/arm/boot/dts/rk322x-android.dtsi
@@ -72,7 +72,7 @@
 		pinctrl-names = "default";
 		pinctrl-0 = <&pwr_key>;
 
-		power {
+		power_key: power-key {
 			label = "GPIO Key Power";
 			gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
 			linux,code = <116>;