From mboxrd@z Thu Jan 1 00:00:00 1970 From: jamie@jamieiles.com (Jamie Iles) Date: Mon, 25 Jul 2011 17:10:00 +0100 Subject: [PATCH 3/3] versatile: convert to common VIC DT probing In-Reply-To: <1311610200-12408-1-git-send-email-jamie@jamieiles.com> References: <1311610200-12408-1-git-send-email-jamie@jamieiles.com> Message-ID: <1311610200-12408-4-git-send-email-jamie@jamieiles.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 Signed-off-by: Jamie Iles --- 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