Skip to content

Commit

Permalink
Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnd Bergmann committed Jul 3, 2012
2 parents c536294 + 7bb71a6 commit a01fcf3
Showing 1 changed file with 17 additions and 0 deletions.
17 changes: 17 additions & 0 deletions arch/arm/boot/dts/ea3250.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
};
};
};

0 comments on commit a01fcf3

Please sign in to comment.