diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-03 21:41:26 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-03 21:41:26 +0200 |
| commit | a01fcf3426df3f782d592bd010d93c61a0d70cb9 (patch) | |
| tree | 3952447cb7365c02a103b7a647be64f3de0c48bd | |
| parent | c53629413409782eeafb4e314dc8c6c8094bff3b (diff) | |
| parent | 7bb71a6c3241b8e20b54fe9978cc9af5eddfd428 (diff) | |
Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt
This branch contains device tree changes for lpc32xx that are
based on top of the earlier lpc32xx-next branch.
* 'lpc32xx/dts' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: Update DTS file for EA3250 board
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/boot/dts/ea3250.dts | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ea3250.dts b/arch/arm/boot/dts/ea3250.dts index c07ba8c2cc0d..d79b28d9c963 100644 --- a/arch/arm/boot/dts/ea3250.dts +++ b/arch/arm/boot/dts/ea3250.dts @@ -152,6 +152,23 @@ uart1: serial@40014000 { status = "okay"; }; + + /* 3-axis accelerometer X,Y,Z (or AD-IN instead of Z) */ + adc@40048000 { + status = "okay"; + }; + }; + }; + + gpio_keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + autorepeat; + button@21 { + label = "GPIO Key UP"; + linux,code = <103>; + gpios = <&gpio 4 1 0>; /* GPI_P3 1 */ }; }; }; |