Commit ad622671 authored by Jamie Iles's avatar Jamie Iles Committed by Russell King
Browse files

ARM: 7183/1: vic: register the VIC for ST-modified VIC's



When probing the VIC, the ST variant has a different probing method to
account for the extra interrupts which meant we didn't previously call
vic_register() which registered the irq_domain.
Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6ae25a5b
...@@ -318,7 +318,7 @@ static void __init vic_set_irq_sources(void __iomem *base, ...@@ -318,7 +318,7 @@ static void __init vic_set_irq_sources(void __iomem *base,
* and 020 within the page. We call this "second block". * and 020 within the page. We call this "second block".
*/ */
static void __init vic_init_st(void __iomem *base, unsigned int irq_start, static void __init vic_init_st(void __iomem *base, unsigned int irq_start,
u32 vic_sources) u32 vic_sources, struct device_node *node)
{ {
unsigned int i; unsigned int i;
int vic_2nd_block = ((unsigned long)base & ~PAGE_MASK) != 0; int vic_2nd_block = ((unsigned long)base & ~PAGE_MASK) != 0;
...@@ -345,6 +345,7 @@ static void __init vic_init_st(void __iomem *base, unsigned int irq_start, ...@@ -345,6 +345,7 @@ static void __init vic_init_st(void __iomem *base, unsigned int irq_start,
} }
vic_set_irq_sources(base, irq_start, vic_sources); vic_set_irq_sources(base, irq_start, vic_sources);
vic_register(base, irq_start, 0, node);
} }
static void __init __vic_init(void __iomem *base, unsigned int irq_start, static void __init __vic_init(void __iomem *base, unsigned int irq_start,
...@@ -367,7 +368,7 @@ static void __init __vic_init(void __iomem *base, unsigned int irq_start, ...@@ -367,7 +368,7 @@ static void __init __vic_init(void __iomem *base, unsigned int irq_start,
switch(vendor) { switch(vendor) {
case AMBA_VENDOR_ST: case AMBA_VENDOR_ST:
vic_init_st(base, irq_start, vic_sources); vic_init_st(base, irq_start, vic_sources, node);
return; return;
default: default:
printk(KERN_WARNING "VIC: unknown vendor, continuing anyways\n"); printk(KERN_WARNING "VIC: unknown vendor, continuing anyways\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment