aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Stigge <stigge@antcom.de>2012-06-14 10:16:17 -0400
committerRoland Stigge <stigge@antcom.de>2012-06-14 10:16:17 -0400
commita6d1be0e5825246da6df42cdaa21f3ce66698ff2 (patch)
tree2201d821de8abd7156ec1cc21b906e2364c7e0e4
parentd0408713e764c20796a8f79f3179ae41148edf19 (diff)
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>
-rw-r--r--arch/arm/boot/dts/lpc32xx.dtsi2
-rw-r--r--arch/arm/boot/dts/phy3250.dts9
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 @@
249 key@40050000 { 249 key@40050000 {
250 compatible = "nxp,lpc3220-key"; 250 compatible = "nxp,lpc3220-key";
251 reg = <0x40050000 0x1000>; 251 reg = <0x40050000 0x1000>;
252 interrupts = <54 0>;
253 status = "disabled";
252 }; 254 };
253 255
254 }; 256 };
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 @@
135 tsc@40048000 { 135 tsc@40048000 {
136 status = "okay"; 136 status = "okay";
137 }; 137 };
138
139 key@40050000 {
140 status = "okay";
141 keypad,num-rows = <1>;
142 keypad,num-columns = <1>;
143 nxp,debounce-delay-ms = <3>;
144 nxp,scan-delay-ms = <34>;
145 linux,keymap = <0x00000002>;
146 };
138 }; 147 };
139 }; 148 };
140 149