Commit 7ced8d0b authored by Guillaume Delbergue's avatar Guillaume Delbergue Committed by Luis Henriques

irqchip/versatile-fpga: Fix PCI IRQ mapping on Versatile PB

commit d5d4fdd8 upstream.

This patch is specifically for PCI support on the Versatile PB board using
a DT. Currently, the dynamic IRQ mapping is broken when using DTs. For
example, on QEMU, the SCSI driver is unable to request the IRQ. To fix
this issue, this patch replaces the current dynamic mechanism with a
static value as is done in the non-DT case.
Signed-off-by: default avatarGuillaume Delbergue <guillaume.delbergue@greensocs.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent a372f780
...@@ -204,7 +204,12 @@ int __init fpga_irq_of_init(struct device_node *node, ...@@ -204,7 +204,12 @@ int __init fpga_irq_of_init(struct device_node *node,
if (!parent_irq) if (!parent_irq)
parent_irq = -1; parent_irq = -1;
#ifdef CONFIG_ARCH_VERSATILE
fpga_irq_init(base, node->name, IRQ_SIC_START, parent_irq, valid_mask,
node);
#else
fpga_irq_init(base, node->name, 0, parent_irq, valid_mask, node); fpga_irq_init(base, node->name, 0, parent_irq, valid_mask, node);
#endif
writel(clear_mask, base + IRQ_ENABLE_CLEAR); writel(clear_mask, base + IRQ_ENABLE_CLEAR);
writel(clear_mask, base + FIQ_ENABLE_CLEAR); writel(clear_mask, base + FIQ_ENABLE_CLEAR);
......
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