Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a01fcf34 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents c5362941 7bb71a6c
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
@@ -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 */
		};
	};
};