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>

19 files changed, 775 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/arm/nspire.txt b/Documentation/devicetree/bindings/arm/nspire.txt
new file mode 100644
index 000000000000..4d08518bd176
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/nspire.txt
@@ -0,0 +1,14 @@
+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";
+        ...
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 6931c4348d24..b27b057c5c4f 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -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.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dfb4fee1f552..aa27704be4e4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 1d41908d5cda..fe079417daa2 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -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
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 1ba358ba16b8..b4615aa9bf7a 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -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
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 \
diff --git a/arch/arm/boot/dts/nspire-classic.dtsi b/arch/arm/boot/dts/nspire-classic.dtsi
new file mode 100644
index 000000000000..9565199bce7a
--- /dev/null
+++ b/arch/arm/boot/dts/nspire-classic.dtsi
@@ -0,0 +1,74 @@
+/*
+ *  linux/arch/arm/boot/nspire-classic.dts
+ *
+ *  Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+
+/include/ "nspire.dtsi"
+
+&lcd {
+        lcd-type = "classic";
+};
+
+&fast_timer {
+        /* compatible = "lsi,zevio-timer"; */
+        reg = <0x90010000 0x1000>, <0x900A0010 0x8>;
+};
+
+&uart {
+        compatible = "ns16550";
+        reg-shift = <2>;
+        reg-io-width = <4>;
+        clocks = <&apb_pclk>;
+        no-loopback-test;
+};
+
+&timer0 {
+        /* compatible = "lsi,zevio-timer"; */
+        reg = <0x900C0000 0x1000>, <0x900A0018 0x8>;
+};
+
+&timer1 {
+        compatible = "lsi,zevio-timer";
+        reg = <0x900D0000 0x1000>, <0x900A0020 0x8>;
+};
+
+&keypad {
+        active-low;
+
+};
+
+&base_clk {
+        compatible = "lsi,nspire-classic-clock";
+};
+
+&ahb_clk {
+        compatible = "lsi,nspire-classic-ahb-divider";
+};
+
+/ {
+        memory {
+                device_type = "memory";
+                reg = <0x10000000 0x2000000>; /* 32 MB */
+        };
+
+        ahb {
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                intc: interrupt-controller@DC000000 {
+                        compatible = "lsi,zevio-intc";
+                        interrupt-controller;
+                        reg = <0xDC000000 0x1000>;
+                        #interrupt-cells = <1>;
+                };
+        };
+        chosen {
+                bootargs = "debug earlyprintk console=tty0 console=ttyS0,115200n8 root=/dev/ram0";
+        };
+};
diff --git a/arch/arm/boot/dts/nspire-clp.dts b/arch/arm/boot/dts/nspire-clp.dts
new file mode 100644
index 000000000000..fa5a044656de
--- /dev/null
+++ b/arch/arm/boot/dts/nspire-clp.dts
@@ -0,0 +1,45 @@
+/*
+ *  linux/arch/arm/boot/nspire-clp.dts
+ *
+ *  Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+/dts-v1/;
+
+/include/ "nspire-classic.dtsi"
+
+&keypad {
+        linux,keymap = <
+        0x0000001c      0x0001001c      0x00020039
+        0x0004002c      0x00050034      0x00060015
+        0x0007000b      0x0008002d      0x01000033
+        0x0101004e      0x01020011      0x01030004
+        0x0104002f      0x01050003      0x01060016
+        0x01070002      0x01080014      0x02000062
+        0x0201000c      0x0202001f      0x02030007
+        0x02040013      0x02050006      0x02060010
+        0x02070005      0x02080019      0x03000027
+        0x03010037      0x03020018      0x0303000a
+        0x03040031      0x03050009      0x03060032
+        0x03070008      0x03080026      0x04000028
+        0x04010035      0x04020025      0x04040024
+        0x04060017      0x04080023      0x05000028
+        0x05020022      0x0503001b      0x05040021
+        0x0505001a      0x05060012      0x0507006f
+        0x05080020      0x0509002a      0x0601001c
+        0x0602002e      0x06030068      0x06040030
+        0x0605006d      0x0606001e      0x06070001
+        0x0608002b      0x0609000f      0x07000067
+        0x0702006a      0x0704006c      0x07060069
+        0x0707000e      0x0708001d      0x070a000d
+        >;
+};
+
+/ {
+        model = "TI-NSPIRE Clickpad";
+        compatible = "ti,nspire-clp";
+};
diff --git a/arch/arm/boot/dts/nspire-cx.dts b/arch/arm/boot/dts/nspire-cx.dts
new file mode 100644
index 000000000000..375b924f60d8
--- /dev/null
+++ b/arch/arm/boot/dts/nspire-cx.dts
@@ -0,0 +1,112 @@
+/*
+ *  linux/arch/arm/boot/nspire-cx.dts
+ *
+ *  Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+/dts-v1/;
+
+/include/ "nspire.dtsi"
+
+&lcd {
+        lcd-type = "cx";
+};
+
+&fast_timer {
+        /* compatible = "arm,sp804", "arm,primecell"; */
+};
+
+&uart {
+        compatible = "arm,pl011", "arm,primecell";
+
+        clocks = <&uart_clk>, <&apb_pclk>;
+        clock-names = "uart_clk", "apb_pclk";
+};
+
+&timer0 {
+        compatible = "arm,sp804", "arm,primecell";
+};
+
+&timer1 {
+        compatible = "arm,sp804", "arm,primecell";
+};
+
+&base_clk {
+        compatible = "lsi,nspire-cx-clock";
+};
+
+&ahb_clk {
+        compatible = "lsi,nspire-cx-ahb-divider";
+};
+
+&keypad {
+        linux,keymap = <
+        0x0000001c      0x0001001c      0x00040039
+        0x0005002c      0x00060015      0x0007000b
+        0x0008000f      0x0100002d      0x01010011
+        0x0102002f      0x01030004      0x01040016
+        0x01050014      0x0106001f      0x01070002
+        0x010a006a      0x02000013      0x02010010
+        0x02020019      0x02030007      0x02040018
+        0x02050031      0x02060032      0x02070005
+        0x02080028      0x0209006c      0x03000026
+        0x03010025      0x03020024      0x0303000a
+        0x03040017      0x03050023      0x03060022
+        0x03070008      0x03080035      0x03090069
+        0x04000021      0x04010012      0x04020020
+        0x0404002e      0x04050030      0x0406001e
+        0x0407000d      0x04080037      0x04090067
+        0x05010038      0x0502000c      0x0503001b
+        0x05040034      0x0505001a      0x05060006
+        0x05080027      0x0509000e      0x050a006f
+        0x0600002b      0x0602004e      0x06030068
+        0x06040003      0x0605006d      0x06060009
+        0x06070001      0x0609000f      0x0708002a
+        0x0709001d      0x070a0033      >;
+};
+
+/ {
+        model = "TI-NSPIRE CX";
+        compatible = "ti,nspire-cx";
+
+        memory {
+                device_type = "memory";
+                reg = <0x10000000 0x4000000>; /* 64 MB */
+        };
+
+        uart_clk: uart_clk {
+                #clock-cells = <0>;
+                compatible = "fixed-clock";
+                clock-frequency = <12000000>;
+        };
+
+        ahb {
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                intc: interrupt-controller@DC000000 {
+                        compatible = "arm,pl190-vic";
+                        interrupt-controller;
+                        reg = <0xDC000000 0x1000>;
+                        #interrupt-cells = <1>;
+                };
+
+                apb@90000000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+
+                        i2c@90050000 {
+                                compatible = "snps,designware-i2c";
+                                reg = <0x90050000 0x1000>;
+                                interrupts = <20>;
+                        };
+                };
+        };
+        chosen {
+                bootargs = "debug earlyprintk console=tty0 console=ttyAMA0,115200n8 root=/dev/ram0";
+        };
+};
diff --git a/arch/arm/boot/dts/nspire-tp.dts b/arch/arm/boot/dts/nspire-tp.dts
new file mode 100644
index 000000000000..621391ce6ed6
--- /dev/null
+++ b/arch/arm/boot/dts/nspire-tp.dts
@@ -0,0 +1,44 @@
+/*
+ *  linux/arch/arm/boot/nspire-tp.dts
+ *
+ *  Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+/dts-v1/;
+
+/include/ "nspire-classic.dtsi"
+
+&keypad {
+        linux,keymap = <
+        0x0000001c      0x0001001c      0x00040039
+        0x0005002c      0x00060015      0x0007000b
+        0x0008000f      0x0100002d      0x01010011
+        0x0102002f      0x01030004      0x01040016
+        0x01050014      0x0106001f      0x01070002
+        0x010a006a      0x02000013      0x02010010
+        0x02020019      0x02030007      0x02040018
+        0x02050031      0x02060032      0x02070005
+        0x02080028      0x0209006c      0x03000026
+        0x03010025      0x03020024      0x0303000a
+        0x03040017      0x03050023      0x03060022
+        0x03070008      0x03080035      0x03090069
+        0x04000021      0x04010012      0x04020020
+        0x0404002e      0x04050030      0x0406001e
+        0x0407000d      0x04080037      0x04090067
+        0x05010038      0x0502000c      0x0503001b
+        0x05040034      0x0505001a      0x05060006
+        0x05080027      0x0509000e      0x050a006f
+        0x0600002b      0x0602004e      0x06030068
+        0x06040003      0x0605006d      0x06060009
+        0x06070001      0x0609000f      0x0708002a
+        0x0709001d      0x070a0033      >;
+};
+
+/ {
+        model = "TI-NSPIRE Touchpad";
+        compatible = "ti,nspire-tp";
+};
diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi
new file mode 100644
index 000000000000..a22ffe633b49
--- /dev/null
+++ b/arch/arm/boot/dts/nspire.dtsi
@@ -0,0 +1,175 @@
+/*
+ *  linux/arch/arm/boot/nspire.dtsi
+ *
+ *  Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+
+/include/ "skeleton.dtsi"
+
+/ {
+        interrupt-parent = <&intc>;
+
+        cpus {
+                cpu@0 {
+                        compatible = "arm,arm926ejs";
+                };
+        };
+
+        bootrom: bootrom@00000000 {
+                reg = <0x00000000 0x80000>;
+        };
+
+        sram: sram@A4000000 {
+                device = "memory";
+                reg = <0xA4000000 0x20000>;
+        };
+
+        timer_clk: timer_clk {
+                #clock-cells = <0>;
+                compatible = "fixed-clock";
+                clock-frequency = <32768>;
+        };
+
+        base_clk: base_clk {
+                #clock-cells = <0>;
+                reg = <0x900B0024 0x4>;
+        };
+
+        ahb_clk: ahb_clk {
+                #clock-cells = <0>;
+                reg = <0x900B0024 0x4>;
+                clocks = <&base_clk>;
+        };
+
+        apb_pclk: apb_pclk {
+                #clock-cells = <0>;
+                compatible = "fixed-factor-clock";
+                clock-div = <2>;
+                clock-mult = <1>;
+                clocks = <&ahb_clk>;
+        };
+
+        ahb {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                spi: spi@A9000000 {
+                        reg = <0xA9000000 0x1000>;
+                };
+
+                usb0: usb@B0000000 {
+                        reg = <0xB0000000 0x1000>;
+                        interrupts = <8>;
+                };
+
+                usb1: usb@B4000000 {
+                        reg = <0xB4000000 0x1000>;
+                        interrupts = <9>;
+                        status = "disabled";
+                };
+
+                lcd: lcd@C0000000 {
+                        compatible = "arm,pl111", "arm,primecell";
+                        reg = <0xC0000000 0x1000>;
+                        interrupts = <21>;
+
+                        clocks = <&apb_pclk>;
+                        clock-names = "apb_pclk";
+                };
+
+                adc: adc@C4000000 {
+                        reg = <0xC4000000 0x1000>;
+                        interrupts = <11>;
+                };
+
+                tdes: crypto@C8010000 {
+                        reg = <0xC8010000 0x1000>;
+                };
+
+                sha256: crypto@CC000000 {
+                        reg = <0xCC000000 0x1000>;
+                };
+
+                apb@90000000 {
+                        compatible = "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        clock-ranges;
+                        ranges;
+
+                        gpio: gpio@90000000 {
+                                reg = <0x90000000 0x1000>;
+                                interrupts = <7>;
+                        };
+
+                        fast_timer: timer@90010000 {
+                                reg = <0x90010000 0x1000>;
+                                interrupts = <17>;
+                        };
+
+                        uart: serial@90020000 {
+                                reg = <0x90020000 0x1000>;
+                                interrupts = <1>;
+                        };
+
+                        timer0: timer@900C0000 {
+                                reg = <0x900C0000 0x1000>;
+
+                                clocks = <&timer_clk>;
+                        };
+
+                        timer1: timer@900D0000 {
+                                reg = <0x900D0000 0x1000>;
+                                interrupts = <19>;
+
+                                clocks = <&timer_clk>;
+                        };
+
+                        watchdog: watchdog@90060000 {
+                                compatible = "arm,amba-primecell";
+                                reg = <0x90060000 0x1000>;
+                                interrupts = <3>;
+                        };
+
+                        rtc: rtc@90090000 {
+                                reg = <0x90090000 0x1000>;
+                                interrupts = <4>;
+                        };
+
+                        misc: misc@900A0000 {
+                                reg = <0x900A0000 0x1000>;
+                        };
+
+                        pwr: pwr@900B0000 {
+                                reg = <0x900B0000 0x1000>;
+                                interrupts = <15>;
+                        };
+
+                        keypad: input@900E0000 {
+                                compatible = "ti,nspire-keypad";
+                                reg = <0x900E0000 0x1000>;
+                                interrupts = <16>;
+
+                                scan-interval = <1000>;
+                                row-delay = <200>;
+
+                                clocks = <&apb_pclk>;
+                        };
+
+                        contrast: contrast@900F0000 {
+                                reg = <0x900F0000 0x1000>;
+                        };
+
+                        led: led@90110000 {
+                                reg = <0x90110000 0x1000>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/include/debug/nspire.S b/arch/arm/include/debug/nspire.S
new file mode 100644
index 000000000000..886fd276fcbc
--- /dev/null
+++ b/arch/arm/include/debug/nspire.S
@@ -0,0 +1,28 @@
+/*
+ *      linux/arch/arm/include/debug/nspire.S
+ *
+ *      Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#define NSPIRE_EARLY_UART_PHYS_BASE        0x90020000
+#define NSPIRE_EARLY_UART_VIRT_BASE        0xfee20000
+
+.macro  addruart, rp, rv, tmp
+        ldr \rp, =(NSPIRE_EARLY_UART_PHYS_BASE)         @ physical base address
+        ldr \rv, =(NSPIRE_EARLY_UART_VIRT_BASE)         @ virtual base address
+.endm
+
+
+#ifdef CONFIG_DEBUG_NSPIRE_CX_UART
+#include <asm/hardware/debug-pl01x.S>
+#endif
+
+#ifdef CONFIG_DEBUG_NSPIRE_CLASSIC_UART
+#define UART_SHIFT 2
+#include <asm/hardware/debug-8250.S>
+#endif
diff --git a/arch/arm/mach-nspire/Kconfig b/arch/arm/mach-nspire/Kconfig
new file mode 100644
index 000000000000..59d8f0a70919
--- /dev/null
+++ b/arch/arm/mach-nspire/Kconfig
@@ -0,0 +1,16 @@
+config ARCH_NSPIRE
+        bool "TI-NSPIRE based"
+        depends on ARCH_MULTI_V4_V5
+        depends on MMU
+        select CPU_ARM926T
+        select COMMON_CLK
+        select GENERIC_CLOCKEVENTS
+        select GENERIC_IRQ_CHIP
+        select SPARSE_IRQ
+        select ARM_AMBA
+        select ARM_VIC
+        select ARM_TIMER_SP804
+        select USE_OF
+        select CLKSRC_OF
+        help
+          This enables support for systems using the TI-NSPIRE CPU
diff --git a/arch/arm/mach-nspire/Makefile b/arch/arm/mach-nspire/Makefile
new file mode 100644
index 000000000000..1bec256eba07
--- /dev/null
+++ b/arch/arm/mach-nspire/Makefile
@@ -0,0 +1,2 @@
+obj-y                           += nspire.o
+obj-y                           += clcd.o
diff --git a/arch/arm/mach-nspire/Makefile.boot b/arch/arm/mach-nspire/Makefile.boot
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/arch/arm/mach-nspire/Makefile.boot
diff --git a/arch/arm/mach-nspire/clcd.c b/arch/arm/mach-nspire/clcd.c
new file mode 100644
index 000000000000..abea12617b17
--- /dev/null
+++ b/arch/arm/mach-nspire/clcd.c
@@ -0,0 +1,119 @@
+/*
+ *      linux/arch/arm/mach-nspire/clcd.c
+ *
+ *      Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/of.h>
+#include <linux/amba/bus.h>
+#include <linux/amba/clcd.h>
+#include <linux/dma-mapping.h>
+
+static struct clcd_panel nspire_cx_lcd_panel = {
+        .mode           = {
+                .name           = "Color LCD",
+                .refresh        = 60,
+                .xres           = 320,
+                .yres           = 240,
+                .sync           = 0,
+                .vmode          = FB_VMODE_NONINTERLACED,
+                .pixclock       = 1,
+                .hsync_len      = 6,
+                .vsync_len      = 1,
+                .right_margin   = 50,
+                .left_margin    = 38,
+                .lower_margin   = 3,
+                .upper_margin   = 17,
+        },
+        .width          = 65, /* ~6.50 cm */
+        .height         = 49, /* ~4.87 cm */
+        .tim2           = TIM2_IPC,
+        .cntl           = CNTL_LCDTFT | CNTL_LCDVCOMP(1),
+        .bpp            = 16,
+        .caps           = CLCD_CAP_565,
+};
+
+static struct clcd_panel nspire_classic_lcd_panel = {
+        .mode           = {
+                .name           = "Grayscale LCD",
+                .refresh        = 60,
+                .xres           = 320,
+                .yres           = 240,
+                .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+                .vmode          = FB_VMODE_NONINTERLACED,
+                .pixclock       = 1,
+                .hsync_len      = 6,
+                .vsync_len      = 1,
+                .right_margin   = 6,
+                .left_margin    = 6,
+        },
+        .width          = 71, /* 7.11cm */
+        .height         = 53, /* 5.33cm */
+        .tim2           = 0x80007d0,
+        .cntl           = CNTL_LCDMONO8,
+        .bpp            = 8,
+        .grayscale      = 1,
+        .caps           = CLCD_CAP_5551,
+};
+
+int nspire_clcd_setup(struct clcd_fb *fb)
+{
+        struct clcd_panel *panel;
+        size_t panel_size;
+        const char *type;
+        dma_addr_t dma;
+        int err;
+
+        BUG_ON(!fb->dev->dev.of_node);
+
+        err = of_property_read_string(fb->dev->dev.of_node, "lcd-type", &type);
+        if (err) {
+                pr_err("CLCD: Could not find lcd-type property\n");
+                return err;
+        }
+
+        if (!strcmp(type, "cx")) {
+                panel = &nspire_cx_lcd_panel;
+        } else if (!strcmp(type, "classic")) {
+                panel = &nspire_classic_lcd_panel;
+        } else {
+                pr_err("CLCD: Unknown lcd-type %s\n", type);
+                return -EINVAL;
+        }
+
+        panel_size = ((panel->mode.xres * panel->mode.yres) * panel->bpp) / 8;
+        panel_size = ALIGN(panel_size, PAGE_SIZE);
+
+        fb->fb.screen_base = dma_alloc_writecombine(&fb->dev->dev,
+                panel_size, &dma, GFP_KERNEL);
+
+        if (!fb->fb.screen_base) {
+                pr_err("CLCD: unable to map framebuffer\n");
+                return -ENOMEM;
+        }
+
+        fb->fb.fix.smem_start = dma;
+        fb->fb.fix.smem_len = panel_size;
+        fb->panel = panel;
+
+        return 0;
+}
+
+int nspire_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma)
+{
+        return dma_mmap_writecombine(&fb->dev->dev, vma,
+                fb->fb.screen_base, fb->fb.fix.smem_start,
+                fb->fb.fix.smem_len);
+}
+
+void nspire_clcd_remove(struct clcd_fb *fb)
+{
+        dma_free_writecombine(&fb->dev->dev, fb->fb.fix.smem_len,
+                fb->fb.screen_base, fb->fb.fix.smem_start);
+}
diff --git a/arch/arm/mach-nspire/clcd.h b/arch/arm/mach-nspire/clcd.h
new file mode 100644
index 000000000000..8c33d2c18371
--- /dev/null
+++ b/arch/arm/mach-nspire/clcd.h
@@ -0,0 +1,14 @@
+/*
+ *      linux/arch/arm/mach-nspire/clcd.h
+ *
+ *      Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+
+int nspire_clcd_setup(struct clcd_fb *fb);
+int nspire_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma);
+void nspire_clcd_remove(struct clcd_fb *fb);
diff --git a/arch/arm/mach-nspire/mmio.h b/arch/arm/mach-nspire/mmio.h
new file mode 100644
index 000000000000..8813471af4cf
--- /dev/null
+++ b/arch/arm/mach-nspire/mmio.h
@@ -0,0 +1,20 @@
+/*
+ *      linux/arch/arm/mach-nspire/mmio.h
+ *
+ *      Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#define NSPIRE_MISC_PHYS_BASE           0x900A0000
+#define NSPIRE_MISC_HWRESET             0x08
+
+#define NSPIRE_PWR_PHYS_BASE            0x900B0000
+#define NSPIRE_PWR_VIRT_BASE            0xFEEB0000
+#define NSPIRE_PWR_BUS_DISABLE1         0x18
+#define NSPIRE_PWR_BUS_DISABLE2         0x20
+
+#define NSPIRE_LCD_PHYS_BASE            0xC0000000
diff --git a/arch/arm/mach-nspire/nspire.c b/arch/arm/mach-nspire/nspire.c
new file mode 100644
index 000000000000..99e26092a9f7
--- /dev/null
+++ b/arch/arm/mach-nspire/nspire.c
@@ -0,0 +1,89 @@
+/*
+ *      linux/arch/arm/mach-nspire/nspire.c
+ *
+ *      Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/init.h>
+#include <linux/of_irq.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <linux/irqchip.h>
+#include <linux/irqchip/arm-vic.h>
+#include <linux/clk-provider.h>
+#include <linux/clkdev.h>
+#include <linux/amba/bus.h>
+#include <linux/amba/clcd.h>
+#include <linux/clocksource.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach-types.h>
+#include <asm/mach/map.h>
+
+#include <asm/hardware/timer-sp.h>
+
+#include "mmio.h"
+#include "clcd.h"
+
+static const char *nspire_dt_match[] __initconst = {
+        "ti,nspire",
+        "ti,nspire-cx",
+        "ti,nspire-tp",
+        "ti,nspire-clp",
+        NULL,
+};
+
+static void __init nspire_map_io(void)
+{
+        debug_ll_io_init();
+}
+
+static struct clcd_board nspire_clcd_data = {
+        .name           = "LCD",
+        .caps           = CLCD_CAP_5551 | CLCD_CAP_565,
+        .check          = clcdfb_check,
+        .decode         = clcdfb_decode,
+        .setup          = nspire_clcd_setup,
+        .mmap           = nspire_clcd_mmap,
+        .remove         = nspire_clcd_remove,
+};
+
+
+static struct of_dev_auxdata nspire_auxdata[] __initdata = {
+        OF_DEV_AUXDATA("arm,pl111", NSPIRE_LCD_PHYS_BASE,
+                        NULL, &nspire_clcd_data),
+        { }
+};
+
+static void __init nspire_init(void)
+{
+        of_platform_populate(NULL, of_default_bus_match_table,
+                        nspire_auxdata, NULL);
+}
+
+static void __init nspire_init_time(void)
+{
+        of_clk_init(NULL);
+        clocksource_of_init();
+}
+
+static void nspire_restart(char mode, const char *cmd)
+{
+        void __iomem *base = ioremap(NSPIRE_MISC_PHYS_BASE, SZ_4K);
+        if (!base)
+                return;
+
+        writel(2, base + NSPIRE_MISC_HWRESET);
+}
+
+DT_MACHINE_START(NSPIRE, "TI-NSPIRE")
+        .dt_compat      = nspire_dt_match,
+        .map_io         = nspire_map_io,
+        .init_time      = nspire_init_time,
+        .init_machine   = nspire_init,
+        .restart        = nspire_restart,
+MACHINE_END