ARM: davinci: use IRQCHIP_DECLARE for cp_intc (9a7f2fc8) · Commits · 戴 / test

arch/arm/mach-davinci/cp_intc.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		#include <linux/export.h>
		#include <linux/init.h>
		#include <linux/irq.h>
		#include <linux/irqchip.h>
		#include <linux/irqdomain.h>
		#include <linux/io.h>
		#include <linux/of.h>
		@@ -210,3 +211,5 @@ void __init cp_intc_init(void)
		{
		cp_intc_of_init(NULL, NULL);
		}

		IRQCHIP_DECLARE(cp_intc, "ti,cp-intc", cp_intc_of_init);

+0 −11

Original line number	Diff line number	Diff line
		@@ -18,16 +18,6 @@
		#include "cp_intc.h"
		#include <mach/da8xx.h>

		static const struct of_device_id const da8xx_irq_match[] __initconst = {
		{ .compatible = "ti,cp-intc", .data = cp_intc_of_init, },
		{ }
		};

		static void __init da8xx_init_irq(void)
		{
		of_irq_init(da8xx_irq_match);
		}

		static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
		OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL),
		OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "davinci-wdt", NULL),
		@@ -64,7 +54,6 @@ static const char *const da850_boards_compat[] __initconst = {

		DT_MACHINE_START(DA850_DT, "Generic DA850/OMAP-L138/AM18x")
		.map_io = da850_init,
		.init_irq = da8xx_init_irq,
		.init_time = davinci_timer_init,
		.init_machine = da850_init_machine,
		.dt_compat = da850_boards_compat,