diff options
| author | Roland Stigge <stigge@antcom.de> | 2012-06-14 16:16:17 +0200 |
|---|---|---|
| committer | Roland Stigge <stigge@antcom.de> | 2012-06-14 16:16:17 +0200 |
| commit | a6d1be0e5825246da6df42cdaa21f3ce66698ff2 (patch) | |
| tree | 2201d821de8abd7156ec1cc21b906e2364c7e0e4 /arch/arm | |
| parent | d0408713e764c20796a8f79f3179ae41148edf19 (diff) | |
| download | blackbird-obmc-linux-a6d1be0e5825246da6df42cdaa21f3ce66698ff2.tar.gz blackbird-obmc-linux-a6d1be0e5825246da6df42cdaa21f3ce66698ff2.zip | |
ARM: LPC32xx: DTS adjustment for key matrix controller
This patch connects the lpc32xx-key driver to the LPC32xx platform (via
lpc32xx.dtsi), and more specifically to the reference board via its dts file.
Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/lpc32xx.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/phy3250.dts | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/lpc32xx.dtsi b/arch/arm/boot/dts/lpc32xx.dtsi index 254d586d4b1a..e2b50b220a38 100644 --- a/arch/arm/boot/dts/lpc32xx.dtsi +++ b/arch/arm/boot/dts/lpc32xx.dtsi @@ -249,6 +249,8 @@ key@40050000 { compatible = "nxp,lpc3220-key"; reg = <0x40050000 0x1000>; + interrupts = <54 0>; + status = "disabled"; }; }; diff --git a/arch/arm/boot/dts/phy3250.dts b/arch/arm/boot/dts/phy3250.dts index d7e985e47831..1dbfea8b7bdf 100644 --- a/arch/arm/boot/dts/phy3250.dts +++ b/arch/arm/boot/dts/phy3250.dts @@ -135,6 +135,15 @@ tsc@40048000 { status = "okay"; }; + + key@40050000 { + status = "okay"; + keypad,num-rows = <1>; + keypad,num-columns = <1>; + nxp,debounce-delay-ms = <3>; + nxp,scan-delay-ms = <34>; + linux,keymap = <0x00000002>; + }; }; }; |
