Merge tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-zesty-kernel.git] / arch / arm / boot / dts / r8a73a4-ape6evm.dts

diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm.dts b/arch/arm/boot/dts/r8a73a4-ape6evm.dts
index f9e81512201a2ec4f6452e9e82b665a40ddf5768..81a38ceee098087ecd05ab13fa5e700783648e29 100644 (file)
--- a/arch/arm/boot/dts/r8a73a4-ape6evm.dts
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm.dts
@@ -75,27 +75,27 @@
        leds {
                compatible = "gpio-leds";
                led1 {
-                       gpios = <&pfc 28 GPIO_ACTIVE_LOW>;
+                       gpios = <&pfc 28 GPIO_ACTIVE_HIGH>;
                        label = "GNSS_EN";
                };
                led2 {
-                       gpios = <&pfc 126 GPIO_ACTIVE_LOW>;
+                       gpios = <&pfc 126 GPIO_ACTIVE_HIGH>;
                        label = "NFC_NRST";
                };
                led3 {
-                       gpios = <&pfc 132 GPIO_ACTIVE_LOW>;
+                       gpios = <&pfc 132 GPIO_ACTIVE_HIGH>;
                        label = "GNSS_NRST";
                };
                led4 {
-                       gpios = <&pfc 232 GPIO_ACTIVE_LOW>;
+                       gpios = <&pfc 232 GPIO_ACTIVE_HIGH>;
                        label = "BT_WAKEUP";
                };
                led5 {
-                       gpios = <&pfc 250 GPIO_ACTIVE_LOW>;
+                       gpios = <&pfc 250 GPIO_ACTIVE_HIGH>;
                        label = "STROBE";
                };
                led6 {
-                       gpios = <&pfc 288 GPIO_ACTIVE_LOW>;
+                       gpios = <&pfc 288 GPIO_ACTIVE_HIGH>;
                        label = "BBRESETOUT";
                };
        };
@@ -103,10 +103,14 @@
        keyboard {
                compatible = "gpio-keys";
 
+               pinctrl-names = "default";
+               pinctrl-0 = <&keyboard_pins>;
+
                zero-key {
                        gpios = <&pfc 324 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_0>;
                        label = "S16";
+                       gpio-key,wakeup;
                };
 
                menu-key {
@@ -203,6 +207,12 @@
                renesas,groups = "sdhi1_data4", "sdhi1_ctrl";
                renesas,function = "sdhi1";
        };
+
+       keyboard_pins: keyboard {
+               renesas,pins = "PORT324", "PORT325", "PORT326", "PORT327",
+                              "PORT328", "PORT329";
+               bias-pull-up;
+       };
 };
 
 &mmcif0 {