[ARM] 3369/1: ep93xx: add core cirrus ep93xx support

Patch from Lennert Buytenhek

This patch adds support for the Cirrus ep93xx series of CPUs.  The
ep93xx is an ARM920T based CPU with two VICs, PL010 based UARTs,
IrDA, MaverickCrunch floating point coprocessor, between 24 and 64
GPIOs, ethernet, OHCI USB and, depending on the model, pcmcia, raster
engine, graphics accelerator, IDE controller and a bunch of other
stuff.

This patch adds the core ep93xx support code, and support for the
Glomation GESBC-9312-sx and the Technologic Systems TS-72xx SBCs.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

9 files changed, 375 insertions, 1 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6e9e8cedd723..0dd24ebdf6ac 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -108,6 +108,13 @@ config ARCH_EBSA110
           Ethernet interface, two PCMCIA sockets, two serial ports and a
           parallel port.
 
+config ARCH_EP93XX
+        bool "EP93xx-based"
+        select ARM_AMBA
+        select ARM_VIC
+        help
+          This enables support for the Cirrus EP93xx series of CPUs.
+
 config ARCH_FOOTBRIDGE
         bool "FootBridge"
         select FOOTBRIDGE
@@ -250,6 +257,8 @@ endchoice
 
 source "arch/arm/mach-clps711x/Kconfig"
 
+source "arch/arm/mach-ep93xx/Kconfig"
+
 source "arch/arm/mach-footbridge/Kconfig"
 
 source "arch/arm/mach-integrator/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index fbfc14a56b96..b5b1e4087516 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -105,6 +105,7 @@ endif
  machine-$(CONFIG_ARCH_AAEC2000)   := aaec2000
  machine-$(CONFIG_ARCH_REALVIEW)   := realview
  machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200
+ machine-$(CONFIG_ARCH_EP93XX)     := ep93xx
 
 ifeq ($(CONFIG_ARCH_EBSA110),y)
 # This is what happens if you forget the IOCS16 line.
diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig
new file mode 100644
index 000000000000..cec5a21ca4e3
--- /dev/null
+++ b/arch/arm/mach-ep93xx/Kconfig
@@ -0,0 +1,21 @@
+if ARCH_EP93XX
+
+menu "Cirrus EP93xx Implementation Options"
+
+comment "EP93xx Platforms"
+
+config MACH_GESBC9312
+        bool "Support Glomation GESBC-9312-sx"
+        help
+          Say 'Y' here if you want your kernel to support the Glomation
+          GESBC-9312-sx board.
+
+config MACH_TS72XX
+        bool "Support Technologic Systems TS-72xx SBC"
+        help
+          Say 'Y' here if you want your kernel to support the
+          Technologic Systems TS-72xx board.
+
+endmenu
+
+endif
diff --git a/arch/arm/mach-ep93xx/Makefile b/arch/arm/mach-ep93xx/Makefile
new file mode 100644
index 000000000000..5393af989e94
--- /dev/null
+++ b/arch/arm/mach-ep93xx/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for the linux kernel.
+#
+obj-y                   := core.o
+obj-m                   :=
+obj-n                   :=
+obj-                    :=
+
+obj-$(CONFIG_MACH_GESBC9312)    += gesbc9312.o
+obj-$(CONFIG_MACH_TS72XX)       += ts72xx.o
diff --git a/arch/arm/mach-ep93xx/Makefile.boot b/arch/arm/mach-ep93xx/Makefile.boot
new file mode 100644
index 000000000000..d5561ad15bad
--- /dev/null
+++ b/arch/arm/mach-ep93xx/Makefile.boot
@@ -0,0 +1,2 @@
+   zreladdr-y   := 0x00008000
+params_phys-y   := 0x00000100
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
new file mode 100644
index 000000000000..f831f74dc8cc
--- /dev/null
+++ b/arch/arm/mach-ep93xx/core.c
@@ -0,0 +1,173 @@
+/*
+ * arch/arm/mach-ep93xx/core.c
+ * Core routines for Cirrus EP93xx chips.
+ *
+ * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>
+ *
+ * Thanks go to Michael Burian and Ray Lehtiniemi for their key
+ * role in the ep93xx linux community.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/serial.h>
+#include <linux/tty.h>
+#include <linux/bitops.h>
+#include <linux/serial.h>
+#include <linux/serial_8250.h>
+#include <linux/serial_core.h>
+#include <linux/device.h>
+#include <linux/mm.h>
+#include <linux/time.h>
+#include <linux/timex.h>
+#include <linux/delay.h>
+#include <linux/amba/bus.h>
+
+#include <asm/types.h>
+#include <asm/setup.h>
+#include <asm/memory.h>
+#include <asm/hardware.h>
+#include <asm/irq.h>
+#include <asm/system.h>
+#include <asm/tlbflush.h>
+#include <asm/pgtable.h>
+#include <asm/io.h>
+
+#include <asm/mach/map.h>
+#include <asm/mach/time.h>
+#include <asm/mach/irq.h>
+
+#include <asm/hardware/vic.h>
+
+
+/*************************************************************************
+ * Static I/O mappings that are needed for all EP93xx platforms
+ *************************************************************************/
+static struct map_desc ep93xx_io_desc[] __initdata = {
+        {
+                .virtual        = EP93XX_AHB_VIRT_BASE,
+                .pfn            = __phys_to_pfn(EP93XX_AHB_PHYS_BASE),
+                .length         = EP93XX_AHB_SIZE,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = EP93XX_APB_VIRT_BASE,
+                .pfn            = __phys_to_pfn(EP93XX_APB_PHYS_BASE),
+                .length         = EP93XX_APB_SIZE,
+                .type           = MT_DEVICE,
+        },
+};
+
+void __init ep93xx_map_io(void)
+{
+        iotable_init(ep93xx_io_desc, ARRAY_SIZE(ep93xx_io_desc));
+}
+
+
+/*************************************************************************
+ * Timer handling for EP93xx
+ *************************************************************************
+ * The ep93xx has four internal timers.  Timers 1, 2 (both 16 bit) and
+ * 3 (32 bit) count down at 508 kHz, are self-reloading, and can generate
+ * an interrupt on underflow.  Timer 4 (40 bit) counts down at 983.04 kHz,
+ * is free-running, and can't generate interrupts.
+ *
+ * The 508 kHz timers are ideal for use for the timer interrupt, as the
+ * most common values of HZ divide 508 kHz nicely.  We pick one of the 16
+ * bit timers (timer 1) since we don't need more than 16 bits of reload
+ * value as long as HZ >= 8.
+ *
+ * The higher clock rate of timer 4 makes it a better choice than the
+ * other timers for use in gettimeoffset(), while the fact that it can't
+ * generate interrupts means we don't have to worry about not being able
+ * to use this timer for something else.  We also use timer 4 for keeping
+ * track of lost jiffies.
+ */
+static unsigned int last_jiffy_time;
+
+#define TIMER4_TICKS_PER_JIFFY          ((CLOCK_TICK_RATE + (HZ/2)) / HZ)
+
+static int ep93xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        write_seqlock(&xtime_lock);
+
+        __raw_writel(1, EP93XX_TIMER1_CLEAR);
+        while (__raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time
+                                                >= TIMER4_TICKS_PER_JIFFY) {
+                last_jiffy_time += TIMER4_TICKS_PER_JIFFY;
+                timer_tick(regs);
+        }
+
+        write_sequnlock(&xtime_lock);
+
+        return IRQ_HANDLED;
+}
+
+static struct irqaction ep93xx_timer_irq = {
+        .name           = "ep93xx timer",
+        .flags          = SA_INTERRUPT | SA_TIMER,
+        .handler        = ep93xx_timer_interrupt,
+};
+
+static void __init ep93xx_timer_init(void)
+{
+        /* Enable periodic HZ timer.  */
+        __raw_writel(0x48, EP93XX_TIMER1_CONTROL);
+        __raw_writel((508000 / HZ) - 1, EP93XX_TIMER1_LOAD);
+        __raw_writel(0xc8, EP93XX_TIMER1_CONTROL);
+
+        /* Enable lost jiffy timer.  */
+        __raw_writel(0x100, EP93XX_TIMER4_VALUE_HIGH);
+
+        setup_irq(IRQ_EP93XX_TIMER1, &ep93xx_timer_irq);
+}
+
+static unsigned long ep93xx_gettimeoffset(void)
+{
+        int offset;
+
+        offset = __raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time;
+
+        /* Calculate (1000000 / 983040) * offset.  */
+        return offset + (53 * offset / 3072);
+}
+
+struct sys_timer ep93xx_timer = {
+        .init           = ep93xx_timer_init,
+        .offset         = ep93xx_gettimeoffset,
+};
+
+
+/*************************************************************************
+ * EP93xx IRQ handling
+ *************************************************************************/
+void __init ep93xx_init_irq(void)
+{
+        vic_init((void *)EP93XX_VIC1_BASE, 0, EP93XX_VIC1_VALID_IRQ_MASK);
+        vic_init((void *)EP93XX_VIC2_BASE, 32, EP93XX_VIC2_VALID_IRQ_MASK);
+}
+
+
+/*************************************************************************
+ * EP93xx peripheral handling
+ *************************************************************************/
+void __init ep93xx_init_devices(void)
+{
+        unsigned int v;
+
+        /*
+         * Disallow access to MaverickCrunch initially.
+         */
+        v = __raw_readl(EP93XX_SYSCON_DEVICE_CONFIG);
+        v &= ~EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE;
+        __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK);
+        __raw_writel(v, EP93XX_SYSCON_DEVICE_CONFIG);
+}
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c
new file mode 100644
index 000000000000..d18fcb1a2f1b
--- /dev/null
+++ b/arch/arm/mach-ep93xx/gesbc9312.c
@@ -0,0 +1,40 @@
+/*
+ * arch/arm/mach-ep93xx/gesbc9312.c
+ * Glomation GESBC-9312-sx support.
+ *
+ * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/mtd/physmap.h>
+#include <asm/io.h>
+#include <asm/hardware.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+static void __init gesbc9312_init_machine(void)
+{
+        ep93xx_init_devices();
+        physmap_configure(0x60000000, 0x00800000, 4, NULL);
+}
+
+MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx")
+        /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
+        .phys_io        = EP93XX_APB_PHYS_BASE,
+        .io_pg_offst    = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
+        .boot_params    = 0x00000100,
+        .map_io         = ep93xx_map_io,
+        .init_irq       = ep93xx_init_irq,
+        .timer          = &ep93xx_timer,
+        .init_machine   = gesbc9312_init_machine,
+MACHINE_END
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
new file mode 100644
index 000000000000..777e75daa8a5
--- /dev/null
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -0,0 +1,118 @@
+/*
+ * arch/arm/mach-ep93xx/ts72xx.c
+ * Technologic Systems TS72xx SBC support.
+ *
+ * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/mtd/physmap.h>
+#include <asm/io.h>
+#include <asm/hardware.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+
+static struct map_desc ts72xx_io_desc[] __initdata = {
+        {
+                .virtual        = TS72XX_MODEL_VIRT_BASE,
+                .pfn            = __phys_to_pfn(TS72XX_MODEL_PHYS_BASE),
+                .length         = TS72XX_MODEL_SIZE,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = TS72XX_OPTIONS_VIRT_BASE,
+                .pfn            = __phys_to_pfn(TS72XX_OPTIONS_PHYS_BASE),
+                .length         = TS72XX_OPTIONS_SIZE,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = TS72XX_OPTIONS2_VIRT_BASE,
+                .pfn            = __phys_to_pfn(TS72XX_OPTIONS2_PHYS_BASE),
+                .length         = TS72XX_OPTIONS2_SIZE,
+                .type           = MT_DEVICE,
+        }
+};
+
+static struct map_desc ts72xx_nand_io_desc[] __initdata = {
+        {
+                .virtual        = TS72XX_NAND_DATA_VIRT_BASE,
+                .pfn            = __phys_to_pfn(TS72XX_NAND1_DATA_PHYS_BASE),
+                .length         = TS72XX_NAND_DATA_SIZE,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = TS72XX_NAND_CONTROL_VIRT_BASE,
+                .pfn            = __phys_to_pfn(TS72XX_NAND1_CONTROL_PHYS_BASE),
+                .length         = TS72XX_NAND_CONTROL_SIZE,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = TS72XX_NAND_BUSY_VIRT_BASE,
+                .pfn            = __phys_to_pfn(TS72XX_NAND1_BUSY_PHYS_BASE),
+                .length         = TS72XX_NAND_BUSY_SIZE,
+                .type           = MT_DEVICE,
+        }
+};
+
+static struct map_desc ts72xx_alternate_nand_io_desc[] __initdata = {
+        {
+                .virtual        = TS72XX_NAND_DATA_VIRT_BASE,
+                .pfn            = __phys_to_pfn(TS72XX_NAND2_DATA_PHYS_BASE),
+                .length         = TS72XX_NAND_DATA_SIZE,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = TS72XX_NAND_CONTROL_VIRT_BASE,
+                .pfn            = __phys_to_pfn(TS72XX_NAND2_CONTROL_PHYS_BASE),
+                .length         = TS72XX_NAND_CONTROL_SIZE,
+                .type           = MT_DEVICE,
+        }, {
+                .virtual        = TS72XX_NAND_BUSY_VIRT_BASE,
+                .pfn            = __phys_to_pfn(TS72XX_NAND2_BUSY_PHYS_BASE),
+                .length         = TS72XX_NAND_BUSY_SIZE,
+                .type           = MT_DEVICE,
+        }
+};
+
+static void __init ts72xx_map_io(void)
+{
+        ep93xx_map_io();
+        iotable_init(ts72xx_io_desc, ARRAY_SIZE(ts72xx_io_desc));
+
+        /*
+         * The TS-7200 has NOR flash, the other models have NAND flash.
+         */
+        if (!board_is_ts7200()) {
+                if (is_ts9420_installed()) {
+                        iotable_init(ts72xx_alternate_nand_io_desc,
+                                ARRAY_SIZE(ts72xx_alternate_nand_io_desc));
+                } else {
+                        iotable_init(ts72xx_nand_io_desc,
+                                ARRAY_SIZE(ts72xx_nand_io_desc));
+                }
+        }
+}
+
+static void __init ts72xx_init_machine(void)
+{
+        ep93xx_init_devices();
+        if (board_is_ts7200())
+                physmap_configure(TS72XX_NOR_PHYS_BASE, 0x01000000, 1, NULL);
+}
+
+MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC")
+        /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
+        .phys_io        = EP93XX_APB_PHYS_BASE,
+        .io_pg_offst    = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
+        .boot_params    = 0x00000100,
+        .map_io         = ts72xx_map_io,
+        .init_irq       = ep93xx_init_irq,
+        .timer          = &ep93xx_timer,
+        .init_machine   = ts72xx_init_machine,
+MACHINE_END
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 3b79d0e23455..eaaec90db972 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -62,7 +62,7 @@ config CPU_ARM720T
 # ARM920T
 config CPU_ARM920T
         bool "Support ARM920T processor" if !ARCH_S3C2410
-        depends on ARCH_INTEGRATOR || ARCH_S3C2410 || ARCH_IMX || ARCH_AAEC2000 || ARCH_AT91RM9200
+        depends on ARCH_EP93XX || ARCH_INTEGRATOR || ARCH_S3C2410 || ARCH_IMX || ARCH_AAEC2000 || ARCH_AT91RM9200
         default y if ARCH_S3C2410 || ARCH_AT91RM9200
         select CPU_32v4
         select CPU_ABRT_EV4T