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 ce65cb98585f903447ae29505928fbb8fbc0dec2..e6ff5764eb374884920c897a2cb1457ae5d47ca4 100644 (file)
--- 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 eceda348da7ebe8bbd6dd867e36c6a4a21e96813..211fcdd8cf30b364a9ea453b0ec33ae62929b200 100644 (file)
--- 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>;