Merge branch 'nspire/soc' into next/late
authorOlof Johansson <olof@lixom.net>
Tue, 25 Jun 2013 20:36:09 +0000 (13:36 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 25 Jun 2013 20:43:18 +0000 (13:43 -0700)
commit2655e828350cc7558d1a74cd4464e34b81e17f36
treeddf5a103b69de5982b102f1f3e8feb6b236a8de1
parentcbe461f65427210fd0f2813d72383f66a46889f1
parent9851ca5774e693e2088a4b34ad456cfaadaf29a7
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>
arch/arm/Kconfig
arch/arm/boot/dts/Makefile