![Grant Likely](/assets/img/avatar_default.png)
irq_domain_add_simple() was a stop-gap measure until complete irq_domain support was complete. This patch removes the irq_domain_add_simple() interface. This patch also drops the explicit irq_domain initialization performed by the mach-versatile code because the versatile interrupt controller already has irq_domain support built into it. This was a bug that was hanging around quietly for a while, but with the full irq_domain which actually verifies that irq_domain ranges are available it would cause the registration to fail and the system wouldn't boot. v4: Fixed number of irqs in mx5 gpio code v2: Updated to pass in host_data pointer on irq_domain allocation. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Milton Miller <miltonm@bga.com> Cc: Russell King <linux@arm.linux.org.uk> Tested-by: Olof Johansson <olof@lixom.net>
116 lines
3.1 KiB
C
116 lines
3.1 KiB
C
/*
|
|
* interrupt controller support for CSR SiRFprimaII
|
|
*
|
|
* Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
|
|
*
|
|
* Licensed under GPLv2 or later.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/io.h>
|
|
#include <linux/irq.h>
|
|
#include <mach/hardware.h>
|
|
#include <asm/mach/irq.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/irqdomain.h>
|
|
#include <linux/syscore_ops.h>
|
|
|
|
#define SIRFSOC_INT_RISC_MASK0 0x0018
|
|
#define SIRFSOC_INT_RISC_MASK1 0x001C
|
|
#define SIRFSOC_INT_RISC_LEVEL0 0x0020
|
|
#define SIRFSOC_INT_RISC_LEVEL1 0x0024
|
|
|
|
void __iomem *sirfsoc_intc_base;
|
|
|
|
static __init void
|
|
sirfsoc_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num)
|
|
{
|
|
struct irq_chip_generic *gc;
|
|
struct irq_chip_type *ct;
|
|
|
|
gc = irq_alloc_generic_chip("SIRFINTC", 1, irq_start, base, handle_level_irq);
|
|
ct = gc->chip_types;
|
|
|
|
ct->chip.irq_mask = irq_gc_mask_clr_bit;
|
|
ct->chip.irq_unmask = irq_gc_mask_set_bit;
|
|
ct->regs.mask = SIRFSOC_INT_RISC_MASK0;
|
|
|
|
irq_setup_generic_chip(gc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE, IRQ_NOREQUEST, 0);
|
|
}
|
|
|
|
static __init void sirfsoc_irq_init(void)
|
|
{
|
|
sirfsoc_alloc_gc(sirfsoc_intc_base, 0, 32);
|
|
sirfsoc_alloc_gc(sirfsoc_intc_base + 4, 32, SIRFSOC_INTENAL_IRQ_END - 32);
|
|
|
|
writel_relaxed(0, sirfsoc_intc_base + SIRFSOC_INT_RISC_LEVEL0);
|
|
writel_relaxed(0, sirfsoc_intc_base + SIRFSOC_INT_RISC_LEVEL1);
|
|
|
|
writel_relaxed(0, sirfsoc_intc_base + SIRFSOC_INT_RISC_MASK0);
|
|
writel_relaxed(0, sirfsoc_intc_base + SIRFSOC_INT_RISC_MASK1);
|
|
}
|
|
|
|
static struct of_device_id intc_ids[] = {
|
|
{ .compatible = "sirf,prima2-intc" },
|
|
{},
|
|
};
|
|
|
|
void __init sirfsoc_of_irq_init(void)
|
|
{
|
|
struct device_node *np;
|
|
|
|
np = of_find_matching_node(NULL, intc_ids);
|
|
if (!np)
|
|
panic("unable to find compatible intc node in dtb\n");
|
|
|
|
sirfsoc_intc_base = of_iomap(np, 0);
|
|
if (!sirfsoc_intc_base)
|
|
panic("unable to map intc cpu registers\n");
|
|
|
|
irq_domain_add_legacy(np, 32, 0, 0, &irq_domain_simple_ops, NULL);
|
|
|
|
of_node_put(np);
|
|
|
|
sirfsoc_irq_init();
|
|
}
|
|
|
|
struct sirfsoc_irq_status {
|
|
u32 mask0;
|
|
u32 mask1;
|
|
u32 level0;
|
|
u32 level1;
|
|
};
|
|
|
|
static struct sirfsoc_irq_status sirfsoc_irq_st;
|
|
|
|
static int sirfsoc_irq_suspend(void)
|
|
{
|
|
sirfsoc_irq_st.mask0 = readl_relaxed(sirfsoc_intc_base + SIRFSOC_INT_RISC_MASK0);
|
|
sirfsoc_irq_st.mask1 = readl_relaxed(sirfsoc_intc_base + SIRFSOC_INT_RISC_MASK1);
|
|
sirfsoc_irq_st.level0 = readl_relaxed(sirfsoc_intc_base + SIRFSOC_INT_RISC_LEVEL0);
|
|
sirfsoc_irq_st.level1 = readl_relaxed(sirfsoc_intc_base + SIRFSOC_INT_RISC_LEVEL1);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void sirfsoc_irq_resume(void)
|
|
{
|
|
writel_relaxed(sirfsoc_irq_st.mask0, sirfsoc_intc_base + SIRFSOC_INT_RISC_MASK0);
|
|
writel_relaxed(sirfsoc_irq_st.mask1, sirfsoc_intc_base + SIRFSOC_INT_RISC_MASK1);
|
|
writel_relaxed(sirfsoc_irq_st.level0, sirfsoc_intc_base + SIRFSOC_INT_RISC_LEVEL0);
|
|
writel_relaxed(sirfsoc_irq_st.level1, sirfsoc_intc_base + SIRFSOC_INT_RISC_LEVEL1);
|
|
}
|
|
|
|
static struct syscore_ops sirfsoc_irq_syscore_ops = {
|
|
.suspend = sirfsoc_irq_suspend,
|
|
.resume = sirfsoc_irq_resume,
|
|
};
|
|
|
|
static int __init sirfsoc_irq_pm_init(void)
|
|
{
|
|
register_syscore_ops(&sirfsoc_irq_syscore_ops);
|
|
return 0;
|
|
}
|
|
device_initcall(sirfsoc_irq_pm_init);
|