diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-09 18:29:33 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-09 18:29:33 -0800 |
| commit | dd8b5c8dac143f2898def5bd49b651c81fad776b (patch) | |
| tree | 74d150b1deeeed83e4242ae512475b5a4fbfe619 /arch/arm/boot/dts/imx28-m28evk.dts | |
| parent | 93ce285503e375a4a751b632dd7b93291629c5cd (diff) | |
| parent | 0943b96058c4262b4e4cd05398f42e8730d5ee08 (diff) | |
Merge tag 'mxs-dt-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
From Shawn Guo:
mxs device tree changes for 3.9
- Mostly cfa100xx related device tree source updates
* tag 'mxs-dt-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs: dts: Add rotary encoder to the CFA-10049
ARM: mxs: dts: Add gpio-keys for the rotary to the CFA-10049
ARM: dts: mxs: Add the LCD to the 10049 board
ARM: dts: mxs: Add muxing options for the third PWM
ARM: dts: cfa10049: Change the SPI3 bus to spi-gpio
ARM: mxs: dt: Add Crystalfontz CFA-10037 device tree support
ARM: mxs: Enable touchscreen on m28evk
ARM: dts: cfa10049: Add PCA9555 GPIO expander to the device tree
Diffstat (limited to 'arch/arm/boot/dts/imx28-m28evk.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx28-m28evk.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts index 3bab6b00c52d..6ce3d17c3a29 100644 --- a/arch/arm/boot/dts/imx28-m28evk.dts +++ b/arch/arm/boot/dts/imx28-m28evk.dts @@ -177,6 +177,7 @@ lradc@80050000 { status = "okay"; + fsl,lradc-touchscreen-wires = <4>; }; duart: serial@80074000 { |