hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

irqchip: vt8500: Convert arch-vt8500 to new irqchip infrastructure 

This patch moves the arch-vt8500 irq code to drivers/irqchip and converts
it to use the new IRQCHIP_DECLARE and irqchip_init. This allows the removal
of some more functions from common.h

Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Tony Prisk 2013-03-24 01:12:25 +00:00 committed by Olof Johansson
parent 26b2da5ae5
commit 06ff14c054
5 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-vt8500/Makefile
View File

@ -1 +1 @@
obj-$(CONFIG_ARCH_VT8500) += irq.o vt8500.o obj-$(CONFIG_ARCH_VT8500) += vt8500.o

6
arch/arm/mach-vt8500/common.h
View File

@ -18,13 +18,7 @@
#include <linux/of.h> #include <linux/of.h>
int __init vt8500_irq_init(struct device_node *node,
struct device_node *parent);
/* defined in drivers/clk/clk-vt8500.c */ /* defined in drivers/clk/clk-vt8500.c */
void __init vtwm_clk_init(void __iomem *pmc_base); void __init vtwm_clk_init(void __iomem *pmc_base);
/* defined in irq.c */
asmlinkage void vt8500_handle_irq(struct pt_regs *regs);
#endif #endif

14
arch/arm/mach-vt8500/vt8500.c
View File

@ -20,6 +20,7 @@
#include <linux/clocksource.h> #include <linux/clocksource.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irqchip.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
@ -166,16 +167,6 @@ void __init vt8500_init(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
} }
static const struct of_device_id vt8500_irq_match[] __initconst = {
{ .compatible = "via,vt8500-intc", .data = vt8500_irq_init, },
{ /* sentinel */ },
};
static void __init vt8500_init_irq(void)
{
of_irq_init(vt8500_irq_match);
};
static const char * const vt8500_dt_compat[] = { static const char * const vt8500_dt_compat[] = {
"via,vt8500", "via,vt8500",
"wm,wm8650", "wm,wm8650",
@ -187,10 +178,9 @@ static const char * const vt8500_dt_compat[] = {
DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)") DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)")
.dt_compat = vt8500_dt_compat, .dt_compat = vt8500_dt_compat,
.map_io = vt8500_map_io, .map_io = vt8500_map_io,
.init_irq = vt8500_init_irq, .init_irq = irqchip_init,
.init_machine = vt8500_init, .init_machine = vt8500_init,
.init_time = clocksource_of_init, .init_time = clocksource_of_init,
.restart = vt8500_restart, .restart = vt8500_restart,
.handle_irq = vt8500_handle_irq,
MACHINE_END MACHINE_END

1
drivers/irqchip/Makefile
View File

@ -12,3 +12,4 @@ obj-$(CONFIG_ARM_VIC) += irq-vic.o
obj-$(CONFIG_RENESAS_INTC_IRQPIN) += irq-renesas-intc-irqpin.o obj-$(CONFIG_RENESAS_INTC_IRQPIN) += irq-renesas-intc-irqpin.o
obj-$(CONFIG_RENESAS_IRQC) += irq-renesas-irqc.o obj-$(CONFIG_RENESAS_IRQC) += irq-renesas-irqc.o
obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o
obj-$(CONFIG_ARCH_VT8500) += irq-vt8500.o

6
arch/arm/mach-vt8500/irq.c → drivers/irqchip/irq-vt8500.c
View File

@ -37,6 +37,9 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/exception.h> #include <asm/exception.h>
#include <asm/mach/irq.h>
#include "irqchip.h"
#define VT8500_ICPC_IRQ 0x20 #define VT8500_ICPC_IRQ 0x20
#define VT8500_ICPC_FIQ 0x24 #define VT8500_ICPC_FIQ 0x24
@ -225,6 +228,8 @@ int __init vt8500_irq_init(struct device_node *node, struct device_node *parent)
goto out; goto out;
} }
set_handle_irq(vt8500_handle_irq);
vt8500_init_irq_hw(intc[active_cnt].base); vt8500_init_irq_hw(intc[active_cnt].base);
pr_info("vt8500-irq: Added interrupt controller\n"); pr_info("vt8500-irq: Added interrupt controller\n");
@ -251,3 +256,4 @@ out:
return 0; return 0;
} }
IRQCHIP_DECLARE(vt8500_irq, "via,vt8500-intc", vt8500_irq_init);