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

[linux-2.6-microblaze.git] / arch / arm / boot / dts / r8a7792-blanche.dts

diff --git a/arch/arm/boot/dts/r8a7792-blanche.dts b/arch/arm/boot/dts/r8a7792-blanche.dts
index c100ae9..62aa9f6 100644 (file)
--- a/arch/arm/boot/dts/r8a7792-blanche.dts
+++ b/arch/arm/boot/dts/r8a7792-blanche.dts
@@ -112,6 +112,9 @@
        keyboard {
                compatible = "gpio-keys";
 
+               pinctrl-0 = <&keyboard_pins>;
+               pinctrl-names = "default";
+
                key-1 {
                        linux,code = <KEY_1>;
                        label = "SW2-1";
@@ -235,6 +238,11 @@
                function = "du1";
        };
 
+       keyboard_pins: keyboard {
+               pins = "GP_3_10", "GP_3_11", "GP_3_12", "GP_3_15", "GP_11_02";
+               bias-pull-up;
+       };
+
        pmic_irq_pins: pmicirq {
                groups = "intc_irq2";
                function = "intc";