Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c51391d authored by Bharat Kumar Gogada's avatar Bharat Kumar Gogada Committed by Bjorn Helgaas
Browse files

PCI: xilinx: Don't call pci_fixup_irqs() on Microblaze 



The Xilinx AXI PCIe Host Bridge Soft IP driver was previously only
supported on ARM (in particular, on ARCH_ZYNC), and pci_fixup_irqs() is
available there.  But Microblaze will do IRQ fixup in pcibios_add_device(),
so pci_fixup_irqs() is not available on Microblaze.

Don't call pci_fixup_irqs() on Microblaze, so the driver can work on both
Zynq and Microblaze Architectures.

[bhelgaas: revise changelog to show similarity to bdb8a184 ("PCI: iproc: Call pci_fixup_irqs() for ARM64 as well as ARM")]
Signed-off-by: default avatarBharat Kumar Gogada <bharatku@xilinx.com>
Signed-off-by: default avatarRavi Kiran Gummaluri <rgummal@xilinx.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent 4c01f3b0

drivers/pci/host/pcie-xilinx.c

+2 −0
Original line number Diff line number Diff line
@@ -705,7 +705,9 @@ static int xilinx_pcie_probe(struct platform_device *pdev) 
#endif

	pci_scan_child_bus(bus);

	pci_assign_unassigned_bus_resources(bus);

#ifndef CONFIG_MICROBLAZE

	pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);

#endif

	pci_bus_add_devices(bus);

	platform_set_drvdata(pdev, port);