[PATCH 3/3] versatile: convert to common VIC DT probing
From: Jamie Iles <hidden>
Date: 2011-07-25 16:10:00
Also in:
linux-devicetree
Subsystem:
arm integrator, versatile and realview support, arm port, arm/versatile express platform, the rest · Maintainers:
Linus Walleij, Russell King, Liviu Dudau, Sudeep Holla, Lorenzo Pieralisi, Linus Torvalds
Use the common VIC probing code in the VIC driver to instantiate the VIC from the DT. Cc: devicetree-discuss at lists.ozlabs.org Cc: Russell King <redacted> Signed-off-by: Jamie Iles <redacted> --- arch/arm/mach-versatile/core.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 15c0091..3f29c01 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c@@ -85,12 +85,6 @@ static struct fpga_irq_data sic_irq = { #define PIC_MASK 0 #endif -/* Lookup table for finding a DT node that represents the vic instance */ -static const struct of_device_id vic_of_match[] __initconst = { - { .compatible = "arm,vic", }, - {} -}; - static const struct of_device_id sic_of_match[] __initconst = { { .compatible = "arm,sic", }, {}
@@ -98,8 +92,7 @@ static const struct of_device_id sic_of_match[] __initconst = { void __init versatile_init_irq(void) { - vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0, 0); - irq_domain_generate_simple(vic_of_match, VERSATILE_VIC_BASE, IRQ_VIC_START); + vic_of_init(); writel(~0, VA_SIC_BASE + SIC_IRQ_ENABLE_CLEAR);
--
1.7.4.1