arm64, acpi, pci: Omit OF related IRQ parsing when running with ACPI kernel.

Signed-off-by: Tomasz Nowicki <tn@semihalf.com>
Signed-off-by: Vadim Lomovtsev <Vadim.Lomovtsev@caviumnetworks.com>

diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
index 7642075895836b9fd6dc234289f7b0764d43afd3..9b6e7890258c265e9a07114f356012a7b864cdc6 100644 (file)
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -53,7 +53,8 @@ int pcibios_add_device(struct pci_dev *dev)
        if (pcibios_add_device_impl)
                return pcibios_add_device_impl(dev);
 
-       dev->irq = of_irq_parse_and_map_pci(dev, 0, 0);
+       if (acpi_disabled)
+               dev->irq = of_irq_parse_and_map_pci(dev, 0, 0);
 
        return 0;
 }