diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-25 22:36:09 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-25 22:43:18 +0200 |
| commit | 2655e828350cc7558d1a74cd4464e34b81e17f36 (patch) | |
| tree | ddf5a103b69de5982b102f1f3e8feb6b236a8de1 /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'soc-exynos5420-2' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | arm: Add Initial TI-Nspire support (diff) | |
| download | linux-2655e828350cc7558d1a74cd4464e34b81e17f36.tar.xz linux-2655e828350cc7558d1a74cd4464e34b81e17f36.zip | |
Merge branch 'nspire/soc' into next/late
From Daniel Tang <dt.tangr@gmail.com>
This is the initial platform code for the TI-Nspire graphing
calculators. The platform support is rather unspectacular, but still
contains platform data for the LCD panel, which will get removed once
there is a DT binding for the AMBA CLCD driver.
* nspire/soc:
arm: Add Initial TI-Nspire support
arm: Add device trees for TI-Nspire hardware
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 13575103594d..60404661585d 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -136,6 +136,9 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ imx28-sps1.dtb \ imx28-tx28.dtb dtb-$(CONFIG_ARCH_NOMADIK) += ste-nomadik-s8815.dtb +dtb-$(CONFIG_ARCH_NSPIRE) += nspire-cx.dtb \ + nspire-tp.dtb \ + nspire-clp.dtb dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap3430-sdp.dtb \ omap3-beagle.dtb \ |