Merge tag 'tags/sunxi-support-for-3.8' of git://github.com/mripard/linux into next/soc

From Maxime Ripard:
Allwinner SoC support for 3.8

* tag 'tags/sunxi-support-for-3.8' of git://github.com/mripard/linux:
  ARM: sunxi: Add entry to MAINTAINERS
  ARM: sunxi: Add device tree for the A13 and the Olinuxino board
  ARM: sunxi: Add earlyprintk support
  ARM: sunxi: Add basic support for Allwinner A1x SoCs
  irqchip: sunxi: Add irq controller driver
  clocksource: sunxi: Add Allwinner A1X Timer Driver
  clk: sunxi: Add dummy fixed rate clock for Allwinner A1X SoCs

Signed-off-by: Olof Johansson <olof@lixom.net>

7 files changed, 356 insertions, 0 deletions

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 71a25b91de00..9c300a828ede 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -19,6 +19,7 @@ endif
 obj-$(CONFIG_MACH_LOONGSON1)    += clk-ls1x.o
 obj-$(CONFIG_ARCH_U8500)        += ux500/
 obj-$(CONFIG_ARCH_VT8500)       += clk-vt8500.o
+obj-$(CONFIG_ARCH_SUNXI)        += clk-sunxi.o
 
 # Chip specific
 obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
diff --git a/drivers/clk/clk-sunxi.c b/drivers/clk/clk-sunxi.c
new file mode 100644
index 000000000000..0e831b584ba7
--- /dev/null
+++ b/drivers/clk/clk-sunxi.c
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2012 Maxime Ripard
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/clk-provider.h>
+#include <linux/clkdev.h>
+#include <linux/clk/sunxi.h>
+#include <linux/of.h>
+
+static const __initconst struct of_device_id clk_match[] = {
+        { .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
+        {}
+};
+
+void __init sunxi_init_clocks(void)
+{
+        of_clk_init(clk_match);
+}
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 6a78073c3808..a0985732f1e2 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -22,6 +22,9 @@ config DW_APB_TIMER_OF
 config ARMADA_370_XP_TIMER
         bool
 
+config SUNXI_TIMER
+        bool
+
 config CLKSRC_DBX500_PRCMU
         bool "Clocksource PRCMU Timer"
         depends on UX500_SOC_DB8500
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 603be366f762..36f06de4c5ab 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -14,5 +14,6 @@ obj-$(CONFIG_DW_APB_TIMER_OF)	+= dw_apb_timer_of.o
 obj-$(CONFIG_CLKSRC_DBX500_PRCMU)       += clksrc-dbx500-prcmu.o
 obj-$(CONFIG_ARMADA_370_XP_TIMER)       += time-armada-370-xp.o
 obj-$(CONFIG_ARCH_BCM2835)      += bcm2835_timer.o
+obj-$(CONFIG_SUNXI_TIMER)       += sunxi_timer.o
 
 obj-$(CONFIG_CLKSRC_ARM_GENERIC)        += arm_generic.o
diff --git a/drivers/clocksource/sunxi_timer.c b/drivers/clocksource/sunxi_timer.c
new file mode 100644
index 000000000000..3c46434b64cb
--- /dev/null
+++ b/drivers/clocksource/sunxi_timer.c
@@ -0,0 +1,170 @@
+/*
+ * Allwinner A1X SoCs timer handling.
+ *
+ * Copyright (C) 2012 Maxime Ripard
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * Based on code from
+ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
+ * Benn Huang <benn@allwinnertech.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/clk.h>
+#include <linux/clockchips.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/irqreturn.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/sunxi_timer.h>
+#include <linux/clk/sunxi.h>
+
+#define TIMER_CTL_REG           0x00
+#define TIMER_CTL_ENABLE                (1 << 0)
+#define TIMER_IRQ_ST_REG        0x04
+#define TIMER0_CTL_REG          0x10
+#define TIMER0_CTL_ENABLE               (1 << 0)
+#define TIMER0_CTL_AUTORELOAD           (1 << 1)
+#define TIMER0_CTL_ONESHOT              (1 << 7)
+#define TIMER0_INTVAL_REG       0x14
+#define TIMER0_CNTVAL_REG       0x18
+
+#define TIMER_SCAL              16
+
+static void __iomem *timer_base;
+
+static void sunxi_clkevt_mode(enum clock_event_mode mode,
+                              struct clock_event_device *clk)
+{
+        u32 u = readl(timer_base + TIMER0_CTL_REG);
+
+        switch (mode) {
+        case CLOCK_EVT_MODE_PERIODIC:
+                u &= ~(TIMER0_CTL_ONESHOT);
+                writel(u | TIMER0_CTL_ENABLE, timer_base + TIMER0_CTL_REG);
+                break;
+
+        case CLOCK_EVT_MODE_ONESHOT:
+                writel(u | TIMER0_CTL_ONESHOT, timer_base + TIMER0_CTL_REG);
+                break;
+        case CLOCK_EVT_MODE_UNUSED:
+        case CLOCK_EVT_MODE_SHUTDOWN:
+        default:
+                writel(u & ~(TIMER0_CTL_ENABLE), timer_base + TIMER0_CTL_REG);
+                break;
+        }
+}
+
+static int sunxi_clkevt_next_event(unsigned long evt,
+                                   struct clock_event_device *unused)
+{
+        u32 u = readl(timer_base + TIMER0_CTL_REG);
+        writel(evt, timer_base + TIMER0_CNTVAL_REG);
+        writel(u | TIMER0_CTL_ENABLE | TIMER0_CTL_AUTORELOAD,
+               timer_base + TIMER0_CTL_REG);
+
+        return 0;
+}
+
+static struct clock_event_device sunxi_clockevent = {
+        .name = "sunxi_tick",
+        .shift = 32,
+        .rating = 300,
+        .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
+        .set_mode = sunxi_clkevt_mode,
+        .set_next_event = sunxi_clkevt_next_event,
+};
+
+
+static irqreturn_t sunxi_timer_interrupt(int irq, void *dev_id)
+{
+        struct clock_event_device *evt = (struct clock_event_device *)dev_id;
+
+        writel(0x1, timer_base + TIMER_IRQ_ST_REG);
+        evt->event_handler(evt);
+
+        return IRQ_HANDLED;
+}
+
+static struct irqaction sunxi_timer_irq = {
+        .name = "sunxi_timer0",
+        .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
+        .handler = sunxi_timer_interrupt,
+        .dev_id = &sunxi_clockevent,
+};
+
+static struct of_device_id sunxi_timer_dt_ids[] = {
+        { .compatible = "allwinner,sunxi-timer" },
+};
+
+static void __init sunxi_timer_init(void)
+{
+        struct device_node *node;
+        unsigned long rate = 0;
+        struct clk *clk;
+        int ret, irq;
+        u32 val;
+
+        node = of_find_matching_node(NULL, sunxi_timer_dt_ids);
+        if (!node)
+                panic("No sunxi timer node");
+
+        timer_base = of_iomap(node, 0);
+        if (!timer_base)
+                panic("Can't map registers");
+
+        irq = irq_of_parse_and_map(node, 0);
+        if (irq <= 0)
+                panic("Can't parse IRQ");
+
+        sunxi_init_clocks();
+
+        clk = of_clk_get(node, 0);
+        if (IS_ERR(clk))
+                panic("Can't get timer clock");
+
+        rate = clk_get_rate(clk);
+
+        writel(rate / (TIMER_SCAL * HZ),
+               timer_base + TIMER0_INTVAL_REG);
+
+        /* set clock source to HOSC, 16 pre-division */
+        val = readl(timer_base + TIMER0_CTL_REG);
+        val &= ~(0x07 << 4);
+        val &= ~(0x03 << 2);
+        val |= (4 << 4) | (1 << 2);
+        writel(val, timer_base + TIMER0_CTL_REG);
+
+        /* set mode to auto reload */
+        val = readl(timer_base + TIMER0_CTL_REG);
+        writel(val | TIMER0_CTL_AUTORELOAD, timer_base + TIMER0_CTL_REG);
+
+        ret = setup_irq(irq, &sunxi_timer_irq);
+        if (ret)
+                pr_warn("failed to setup irq %d\n", irq);
+
+        /* Enable timer0 interrupt */
+        val = readl(timer_base + TIMER_CTL_REG);
+        writel(val | TIMER_CTL_ENABLE, timer_base + TIMER_CTL_REG);
+
+        sunxi_clockevent.mult = div_sc(rate / TIMER_SCAL,
+                                NSEC_PER_SEC,
+                                sunxi_clockevent.shift);
+        sunxi_clockevent.max_delta_ns = clockevent_delta2ns(0xff,
+                                                            &sunxi_clockevent);
+        sunxi_clockevent.min_delta_ns = clockevent_delta2ns(0x1,
+                                                            &sunxi_clockevent);
+        sunxi_clockevent.cpumask = cpumask_of(0);
+
+        clockevents_register_device(&sunxi_clockevent);
+}
+
+struct sys_timer sunxi_timer = {
+        .init = sunxi_timer_init,
+};
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index e2e6eb5d32f4..02bd37a6187f 100644
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -1,2 +1,3 @@
 obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o
+obj-$(CONFIG_ARCH_SUNXI)   += irq-sunxi.o
 obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o
diff --git a/drivers/irqchip/irq-sunxi.c b/drivers/irqchip/irq-sunxi.c
new file mode 100644
index 000000000000..eef41a49acae
--- /dev/null
+++ b/drivers/irqchip/irq-sunxi.c
@@ -0,0 +1,150 @@
+/*
+ * Allwinner A1X SoCs IRQ chip driver.
+ *
+ * Copyright (C) 2012 Maxime Ripard
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * Based on code from
+ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
+ * Benn Huang <benn@allwinnertech.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+
+#include <linux/irqchip/sunxi.h>
+
+#define SUNXI_IRQ_VECTOR_REG            0x00
+#define SUNXI_IRQ_PROTECTION_REG        0x08
+#define SUNXI_IRQ_NMI_CTRL_REG          0x0c
+#define SUNXI_IRQ_PENDING_REG(x)        (0x10 + 0x4 * x)
+#define SUNXI_IRQ_FIQ_PENDING_REG(x)    (0x20 + 0x4 * x)
+#define SUNXI_IRQ_ENABLE_REG(x)         (0x40 + 0x4 * x)
+#define SUNXI_IRQ_MASK_REG(x)           (0x50 + 0x4 * x)
+
+static void __iomem *sunxi_irq_base;
+static struct irq_domain *sunxi_irq_domain;
+
+void sunxi_irq_ack(struct irq_data *irqd)
+{
+        unsigned int irq = irqd_to_hwirq(irqd);
+        unsigned int irq_off = irq % 32;
+        int reg = irq / 32;
+        u32 val;
+
+        val = readl(sunxi_irq_base + SUNXI_IRQ_PENDING_REG(reg));
+        writel(val | (1 << irq_off),
+               sunxi_irq_base + SUNXI_IRQ_PENDING_REG(reg));
+}
+
+static void sunxi_irq_mask(struct irq_data *irqd)
+{
+        unsigned int irq = irqd_to_hwirq(irqd);
+        unsigned int irq_off = irq % 32;
+        int reg = irq / 32;
+        u32 val;
+
+        val = readl(sunxi_irq_base + SUNXI_IRQ_ENABLE_REG(reg));
+        writel(val & ~(1 << irq_off),
+               sunxi_irq_base + SUNXI_IRQ_ENABLE_REG(reg));
+}
+
+static void sunxi_irq_unmask(struct irq_data *irqd)
+{
+        unsigned int irq = irqd_to_hwirq(irqd);
+        unsigned int irq_off = irq % 32;
+        int reg = irq / 32;
+        u32 val;
+
+        val = readl(sunxi_irq_base + SUNXI_IRQ_ENABLE_REG(reg));
+        writel(val | (1 << irq_off),
+               sunxi_irq_base + SUNXI_IRQ_ENABLE_REG(reg));
+}
+
+static struct irq_chip sunxi_irq_chip = {
+        .name           = "sunxi_irq",
+        .irq_ack        = sunxi_irq_ack,
+        .irq_mask       = sunxi_irq_mask,
+        .irq_unmask     = sunxi_irq_unmask,
+};
+
+static int sunxi_irq_map(struct irq_domain *d, unsigned int virq,
+                         irq_hw_number_t hw)
+{
+        irq_set_chip_and_handler(virq, &sunxi_irq_chip,
+                                 handle_level_irq);
+        set_irq_flags(virq, IRQF_VALID | IRQF_PROBE);
+
+        return 0;
+}
+
+static struct irq_domain_ops sunxi_irq_ops = {
+        .map = sunxi_irq_map,
+        .xlate = irq_domain_xlate_onecell,
+};
+
+static int __init sunxi_of_init(struct device_node *node,
+                                struct device_node *parent)
+{
+        sunxi_irq_base = of_iomap(node, 0);
+        if (!sunxi_irq_base)
+                panic("%s: unable to map IC registers\n",
+                        node->full_name);
+
+        /* Disable all interrupts */
+        writel(0, sunxi_irq_base + SUNXI_IRQ_ENABLE_REG(0));
+        writel(0, sunxi_irq_base + SUNXI_IRQ_ENABLE_REG(1));
+        writel(0, sunxi_irq_base + SUNXI_IRQ_ENABLE_REG(2));
+
+        /* Mask all the interrupts */
+        writel(0, sunxi_irq_base + SUNXI_IRQ_MASK_REG(0));
+        writel(0, sunxi_irq_base + SUNXI_IRQ_MASK_REG(1));
+        writel(0, sunxi_irq_base + SUNXI_IRQ_MASK_REG(2));
+
+        /* Clear all the pending interrupts */
+        writel(0xffffffff, sunxi_irq_base + SUNXI_IRQ_PENDING_REG(0));
+        writel(0xffffffff, sunxi_irq_base + SUNXI_IRQ_PENDING_REG(1));
+        writel(0xffffffff, sunxi_irq_base + SUNXI_IRQ_PENDING_REG(2));
+
+        /* Enable protection mode */
+        writel(0x01, sunxi_irq_base + SUNXI_IRQ_PROTECTION_REG);
+
+        /* Configure the external interrupt source type */
+        writel(0x00, sunxi_irq_base + SUNXI_IRQ_NMI_CTRL_REG);
+
+        sunxi_irq_domain = irq_domain_add_linear(node, 3 * 32,
+                                                 &sunxi_irq_ops, NULL);
+        if (!sunxi_irq_domain)
+                panic("%s: unable to create IRQ domain\n", node->full_name);
+
+        return 0;
+}
+
+static struct of_device_id sunxi_irq_dt_ids[] __initconst = {
+        { .compatible = "allwinner,sunxi-ic", .data = sunxi_of_init }
+};
+
+void __init sunxi_init_irq(void)
+{
+        of_irq_init(sunxi_irq_dt_ids);
+}
+
+asmlinkage void __exception_irq_entry sunxi_handle_irq(struct pt_regs *regs)
+{
+        u32 irq, hwirq;
+
+        hwirq = readl(sunxi_irq_base + SUNXI_IRQ_VECTOR_REG) >> 2;
+        while (hwirq != 0) {
+                irq = irq_find_mapping(sunxi_irq_domain, hwirq);
+                handle_IRQ(irq, regs);
+                hwirq = readl(sunxi_irq_base + SUNXI_IRQ_VECTOR_REG) >> 2;
+        }
+}