diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-08-23 21:09:38 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-09-03 19:20:04 +0200 |
| commit | ef8932b94a441a189aaca15ef1b86d9e46b3f933 (patch) | |
| tree | 4a3e01691ef5d5cc6545bddd168985b8109f4335 /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt (diff) | |
| parent | ARM: dts: mxs: add pin config for LCD sync and clock pins (diff) | |
| download | linux-ef8932b94a441a189aaca15ef1b86d9e46b3f933.tar.xz linux-ef8932b94a441a189aaca15ef1b86d9e46b3f933.zip | |
Merge tag 'mxs-dt-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
From Shawn Guo:
It contains mxs device tree changes for 3.12.
- New board addition and hogpins cleanup for Crystalfontz
- New pinctrl entry addition for lcd, ssp2 and saif0
- Add alias and labels for various nodes
- Enable devices like LRADC and USB for a couple of imx23 boards,
and backlight for M28EVK
* tag 'mxs-dt-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: dts: mxs: add pin config for LCD sync and clock pins
ARM: dts: mxs: add pin config for SSP3 interface
ARM: dts: mxs: add another set of saif0_pins (without MCLK)
ARM: dts: mxs: add labels to most nodes for easier reference
ARM: dts: mxs: whitespace cleanup
ARM: dts: mxs: Add spi alias
ARM: dts: imx23-olinuxino: enable Low Resolution ADC
ARM: dts: imx23-evk: enable Low Resolution ADC
ARM: dts: imx23-evk: enable USB PHY and controller
ARM: dts: mxs: remove old DMA binding data from client nodes
ARM: mxs: Add backlight support for M28EVK
ARM: mxs: dt: cfa10036: make hogpins grabbed by respective drivers
ARM: mxs: dt: cfa10057: remove hogpins
ARM: mxs: dt: cfa10055: make hogpins grabbed by respective drivers
ARM: mxs: dt: cfa10049: make hogpins grabbed by respective drivers
ARM: mxs: dt: cfa10037: make hogpins grabbed by respective drivers
ARM: mxs: dt: Add Crystalfontz CFA-10058 device tree
ARM: mxs: dt: Add Crystalfontz CFA-10056 device tree
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 34d317ecff18..a4916875b00b 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -144,7 +144,9 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ imx28-cfa10037.dtb \ imx28-cfa10049.dtb \ imx28-cfa10055.dtb \ + imx28-cfa10056.dtb \ imx28-cfa10057.dtb \ + imx28-cfa10058.dtb \ imx28-evk.dtb \ imx28-m28evk.dtb \ imx28-sps1.dtb \ |