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

[linux-2.6-microblaze.git] / arch / arm / boot / dts / r8a7793-gose.dts

diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts
index 87fa57a..479e0fd 100644 (file)
--- a/arch/arm/boot/dts/r8a7793-gose.dts
+++ b/arch/arm/boot/dts/r8a7793-gose.dts
@@ -64,9 +64,12 @@
                reg = <0 0x40000000 0 0x40000000>;
        };
 
-       gpio-keys {
+       keyboard {
                compatible = "gpio-keys";
 
+               pinctrl-0 = <&keyboard_pins>;
+               pinctrl-names = "default";
+
                key-1 {
                        gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_1>;
@@ -567,6 +570,11 @@
                function = "audio_clk";
        };
 
+       keyboard_pins: keyboard {
+               pins = "GP_5_0", "GP_5_1", "GP_5_2", "GP_5_3";
+               bias-pull-up;
+       };
+
        vin0_pins: vin0 {
                groups = "vin0_data24", "vin0_sync", "vin0_clkenb", "vin0_clk";
                function = "vin0";