Commit 2655e828 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents cbe461f6 9851ca57

Documentation/devicetree/bindings/arm/nspire.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
TI-NSPIRE calculators



Required properties:

- compatible: Compatible property value should contain "ti,nspire".

	CX models should have "ti,nspire-cx"

	Touchpad models should have "ti,nspire-tp"

	Clickpad models should have "ti,nspire-clp"



Example:



/ {

	model = "TI-NSPIRE CX";

	compatible = "ti,nspire-cx";

	...

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ idt Integrated Device Technologies, Inc. 
img	Imagination Technologies Ltd.

intercontrol	Inter Control Group

linux	Linux-specific binding

lsi	LSI Corp. (LSI Logic)

marvell	Marvell Technology Group Ltd.

maxim	Maxim Integrated Products

mosaixtech	Mosaix Technologies, Inc.

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -964,6 +964,8 @@ source "arch/arm/mach-netx/Kconfig" 


source "arch/arm/mach-nomadik/Kconfig"



source "arch/arm/mach-nspire/Kconfig"



source "arch/arm/plat-omap/Kconfig"



source "arch/arm/mach-omap1/Kconfig"

arch/arm/Kconfig.debug

+16 −0
Original line number Diff line number Diff line
@@ -309,6 +309,20 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on MVEBU based platforms.



	config DEBUG_NSPIRE_CLASSIC_UART

		bool "Kernel low-level debugging via TI-NSPIRE 8250 UART"

		depends on ARCH_NSPIRE

		help

		  Say Y here if you want kernel low-level debugging support

		  on TI-NSPIRE classic models.



	config DEBUG_NSPIRE_CX_UART

		bool "Kernel low-level debugging via TI-NSPIRE PL011 UART"

		depends on ARCH_NSPIRE

		help

		  Say Y here if you want kernel low-level debugging support

		  on TI-NSPIRE CX models.



	config DEBUG_NOMADIK_UART

		bool "Kernel low-level debugging messages via NOMADIK UART"

		depends on ARCH_NOMADIK
@@ -633,6 +647,8 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX53_UART ||\

				 DEBUG_IMX6Q_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/nspire.S" if 	DEBUG_NSPIRE_CX_UART || \

					DEBUG_NSPIRE_CLASSIC_UART

	default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART

	default "debug/nomadik.S" if DEBUG_NOMADIK_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ machine-$(CONFIG_ARCH_MXS) += mxs 
machine-$(CONFIG_ARCH_MVEBU)		+= mvebu

machine-$(CONFIG_ARCH_NETX)		+= netx

machine-$(CONFIG_ARCH_NOMADIK)		+= nomadik

machine-$(CONFIG_ARCH_NSPIRE)		+= nspire

machine-$(CONFIG_ARCH_OMAP1)		+= omap1

machine-$(CONFIG_ARCH_OMAP2PLUS)	+= omap2

machine-$(CONFIG_ARCH_ORION5X)		+= orion5x