ARM: mxs: move icoll driver into drivers/irqchip

Move icoll.c into drivers/irqchip as irq-mxs.c, and along with the
renaming, change the driver to use IRQCHIP_DECLARE.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

4 files changed, 5 insertions, 134 deletions

diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile
index 76c336e6f5b5..b934603e2765 100644
--- a/arch/arm/mach-mxs/Makefile
+++ b/arch/arm/mach-mxs/Makefile
@@ -1,5 +1,5 @@
 # Common support
-obj-y := icoll.o ocotp.o system.o mm.o
+obj-y := ocotp.o system.o mm.o
 
 obj-$(CONFIG_PM) += pm.o
 
diff --git a/arch/arm/mach-mxs/icoll.c b/arch/arm/mach-mxs/icoll.c
deleted file mode 100644
index b4d620765cf1..000000000000
--- a/arch/arm/mach-mxs/icoll.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/irqdomain.h>
-#include <linux/io.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_irq.h>
-#include <linux/stmp_device.h>
-#include <asm/exception.h>
-
-#define HW_ICOLL_VECTOR                         0x0000
-#define HW_ICOLL_LEVELACK                       0x0010
-#define HW_ICOLL_CTRL                           0x0020
-#define HW_ICOLL_STAT_OFFSET                    0x0070
-#define HW_ICOLL_INTERRUPTn_SET(n)              (0x0124 + (n) * 0x10)
-#define HW_ICOLL_INTERRUPTn_CLR(n)              (0x0128 + (n) * 0x10)
-#define BM_ICOLL_INTERRUPTn_ENABLE              0x00000004
-#define BV_ICOLL_LEVELACK_IRQLEVELACK__LEVEL0   0x1
-
-#define ICOLL_NUM_IRQS          128
-
-static void __iomem *icoll_base;
-static struct irq_domain *icoll_domain;
-
-static void icoll_ack_irq(struct irq_data *d)
-{
-        /*
-         * The Interrupt Collector is able to prioritize irqs.
-         * Currently only level 0 is used. So acking can use
-         * BV_ICOLL_LEVELACK_IRQLEVELACK__LEVEL0 unconditionally.
-         */
-        __raw_writel(BV_ICOLL_LEVELACK_IRQLEVELACK__LEVEL0,
-                        icoll_base + HW_ICOLL_LEVELACK);
-}
-
-static void icoll_mask_irq(struct irq_data *d)
-{
-        __raw_writel(BM_ICOLL_INTERRUPTn_ENABLE,
-                        icoll_base + HW_ICOLL_INTERRUPTn_CLR(d->hwirq));
-}
-
-static void icoll_unmask_irq(struct irq_data *d)
-{
-        __raw_writel(BM_ICOLL_INTERRUPTn_ENABLE,
-                        icoll_base + HW_ICOLL_INTERRUPTn_SET(d->hwirq));
-}
-
-static struct irq_chip mxs_icoll_chip = {
-        .irq_ack = icoll_ack_irq,
-        .irq_mask = icoll_mask_irq,
-        .irq_unmask = icoll_unmask_irq,
-};
-
-asmlinkage void __exception_irq_entry icoll_handle_irq(struct pt_regs *regs)
-{
-        u32 irqnr;
-
-        do {
-                irqnr = __raw_readl(icoll_base + HW_ICOLL_STAT_OFFSET);
-                if (irqnr != 0x7f) {
-                        __raw_writel(irqnr, icoll_base + HW_ICOLL_VECTOR);
-                        irqnr = irq_find_mapping(icoll_domain, irqnr);
-                        handle_IRQ(irqnr, regs);
-                        continue;
-                }
-                break;
-        } while (1);
-}
-
-static int icoll_irq_domain_map(struct irq_domain *d, unsigned int virq,
-                                irq_hw_number_t hw)
-{
-        irq_set_chip_and_handler(virq, &mxs_icoll_chip, handle_level_irq);
-        set_irq_flags(virq, IRQF_VALID);
-
-        return 0;
-}
-
-static struct irq_domain_ops icoll_irq_domain_ops = {
-        .map = icoll_irq_domain_map,
-        .xlate = irq_domain_xlate_onecell,
-};
-
-static void __init icoll_of_init(struct device_node *np,
-                          struct device_node *interrupt_parent)
-{
-        icoll_base = of_iomap(np, 0);
-        WARN_ON(!icoll_base);
-
-        /*
-         * Interrupt Collector reset, which initializes the priority
-         * for each irq to level 0.
-         */
-        stmp_reset_block(icoll_base + HW_ICOLL_CTRL);
-
-        icoll_domain = irq_domain_add_linear(np, ICOLL_NUM_IRQS,
-                                             &icoll_irq_domain_ops, NULL);
-        WARN_ON(!icoll_domain);
-}
-
-static const struct of_device_id icoll_of_match[] __initconst = {
-        {.compatible = "fsl,icoll", .data = icoll_of_init},
-        { /* sentinel */ }
-};
-
-void __init icoll_init_irq(void)
-{
-        of_irq_init(icoll_of_match);
-}
diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h
index e043c4735b5a..df2a4ef14dae 100644
--- a/arch/arm/mach-mxs/include/mach/common.h
+++ b/arch/arm/mach-mxs/include/mach/common.h
@@ -22,7 +22,4 @@ extern void mx23_map_io(void);
 extern int mx28_clocks_init(void);
 extern void mx28_map_io(void);
 
-extern void icoll_init_irq(void);
-extern void icoll_handle_irq(struct pt_regs *);
-
 #endif /* __MACH_MXS_COMMON_H__ */
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index c1c0fb414c28..10506381b446 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -18,6 +18,8 @@
 #include <linux/err.h>
 #include <linux/gpio.h>
 #include <linux/init.h>
+#include <linux/irqchip.h>
+#include <linux/irqchip/mxs.h>
 #include <linux/micrel_phy.h>
 #include <linux/mxsfb.h>
 #include <linux/of_platform.h>
@@ -469,7 +471,7 @@ static const char *imx28_dt_compat[] __initdata = {
 
 DT_MACHINE_START(IMX23, "Freescale i.MX23 (Device Tree)")
         .map_io         = mx23_map_io,
-        .init_irq       = icoll_init_irq,
+        .init_irq       = irqchip_init,
         .handle_irq     = icoll_handle_irq,
         .init_time      = imx23_timer_init,
         .init_machine   = mxs_machine_init,
@@ -479,7 +481,7 @@ MACHINE_END
 
 DT_MACHINE_START(IMX28, "Freescale i.MX28 (Device Tree)")
         .map_io         = mx28_map_io,
-        .init_irq       = icoll_init_irq,
+        .init_irq       = irqchip_init,
         .handle_irq     = icoll_handle_irq,
         .init_time      = imx28_timer_init,
         .init_machine   = mxs_machine_init,