ARM: pxa: raumfeld-controller: fix 'dock detect' GPIO key

The dock detection input key is active low. Also add a pinmux for it.

Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>

diff --git a/arch/arm/boot/dts/pxa300-raumfeld-controller.dts b/arch/arm/boot/dts/pxa300-raumfeld-controller.dts
index 65d825091f0dcbc18483f0c5b5d1bfab923c1983..e0e1f99c6b228d6b7799f5d54216ef7a4fb2b9b4 100644 (file)
--- a/arch/arm/boot/dts/pxa300-raumfeld-controller.dts
+++ b/arch/arm/boot/dts/pxa300-raumfeld-controller.dts
@@ -109,9 +109,10 @@
 };
 
 &keys {
+       pinctrl-0 = <&gpio_keys_pins &dock_detect_pins>;
        dock-detect {
                label = "dock detect";
-               gpios = <&gpio 116 GPIO_ACTIVE_HIGH>;
+               gpios = <&gpio 116 GPIO_ACTIVE_LOW>;
                linux,code = <KEY_F5>;
        };
 };
@@ -236,6 +237,14 @@
                pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_FLOAT);
        };
 
+       dock_detect_pins: dock_detect_pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(116) MFP_AF0     /* DOCK_DETECT  */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_HIGH);
+               pinctrl-single,bias-pullup = MPF_PULL_UP;
+       };
+
        lcdc_pins: lcdc-pins {
                pinctrl-single,pins = <
                        MFP_PIN_PXA300(54) MFP_AF1      /* LDD_0        */