Merge commit '81fd23e2b3ccf71c807e671444e8accaba98ca53' of https://git.pengutronix...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / r8a7794-silk.dts

diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index eb89a27..cafa304 100644 (file)
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -45,9 +45,12 @@
                reg = <0 0x40000000 0 0x40000000>;
        };
 
-       gpio-keys {
+       keyboard {
                compatible = "gpio-keys";
 
+               pinctrl-0 = <&keyboard_pins>;
+               pinctrl-names = "default";
+
                key-3 {
                        gpios = <&gpio5 10 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_3>;
@@ -358,6 +361,11 @@
                function = "du1";
        };
 
+       keyboard_pins: keyboard {
+               pins = "GP_3_9", "GP_3_10", "GP_3_11", "GP_3_12";
+               bias-pull-up;
+       };
+
        ssi_pins: sound {
                groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data";
                function = "ssi";