diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2016-01-19 20:59:10 +0000 |
---|---|---|
committer | Rafał Miłecki <zajec5@gmail.com> | 2016-01-19 20:59:10 +0000 |
commit | 000295f8baf25bed023c651bf48409c5ac4b7724 (patch) | |
tree | 208a8ad30f56f8f6fe2d26576315123c17961efb /target/linux/bcm53xx/patches-4.1/036-0003-PCI-iproc-Call-pci_fixup_irqs-for-ARM64-as-well-as-A.patch | |
parent | bba8f059d746863999e3b73832ee9d66fb4975bd (diff) | |
download | upstream-000295f8baf25bed023c651bf48409c5ac4b7724.tar.gz upstream-000295f8baf25bed023c651bf48409c5ac4b7724.tar.bz2 upstream-000295f8baf25bed023c651bf48409c5ac4b7724.zip |
bcm53xx: move iProc patches that went mainline
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 48370
Diffstat (limited to 'target/linux/bcm53xx/patches-4.1/036-0003-PCI-iproc-Call-pci_fixup_irqs-for-ARM64-as-well-as-A.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-4.1/036-0003-PCI-iproc-Call-pci_fixup_irqs-for-ARM64-as-well-as-A.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-4.1/036-0003-PCI-iproc-Call-pci_fixup_irqs-for-ARM64-as-well-as-A.patch b/target/linux/bcm53xx/patches-4.1/036-0003-PCI-iproc-Call-pci_fixup_irqs-for-ARM64-as-well-as-A.patch new file mode 100644 index 0000000000..2b4b3ffb0d --- /dev/null +++ b/target/linux/bcm53xx/patches-4.1/036-0003-PCI-iproc-Call-pci_fixup_irqs-for-ARM64-as-well-as-A.patch @@ -0,0 +1,31 @@ +From bdb8a1844f3113ec08915d1e8e3fd5686fb2fb78 Mon Sep 17 00:00:00 2001 +From: Ray Jui <rjui@broadcom.com> +Date: Tue, 15 Sep 2015 17:39:17 -0700 +Subject: [PATCH 3/7] PCI: iproc: Call pci_fixup_irqs() for ARM64 as well as + ARM + +After 459a07721c11 ("PCI: Build setup-irq.o for arm64"), we build +setup-irq.o for arm64, so we can use pci_fixup_irqs() on both arm and +arm64. + +Remove the "#ifdef CONFIG_ARM" around the call to pci_fixup_irqs(). + +[bhelgaas: changelog] +Signed-off-by: Ray Jui <rjui@broadcom.com> +Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> +--- + drivers/pci/host/pcie-iproc.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/drivers/pci/host/pcie-iproc.c ++++ b/drivers/pci/host/pcie-iproc.c +@@ -237,9 +237,7 @@ int iproc_pcie_setup(struct iproc_pcie * + + pci_scan_child_bus(bus); + pci_assign_unassigned_bus_resources(bus); +-#ifdef CONFIG_ARM + pci_fixup_irqs(pci_common_swizzle, pcie->map_irq); +-#endif + pci_bus_add_devices(bus); + + return 0; |