diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-10 06:29:34 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-04-26 06:05:38 -0400 |
commit | 66e9279a013c4991b95de20fbe670e27aeb49524 (patch) | |
tree | cf188b183ec9431782b4eefb0d0de8cfe95b44b2 | |
parent | 8084de8ad53332ed6e0ffe5db85533b8150d7d6b (diff) |
ARM: PCI: footbridge: provide a 'no swizzle' function for CATS
CATS sets its swizzle function to zero, which at the moment means
that no swizzling is required. Make this explicit for CATS.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-footbridge/cats-pci.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-footbridge/cats-pci.c b/arch/arm/mach-footbridge/cats-pci.c index 32321f66dec4..dc13c873ff53 100644 --- a/arch/arm/mach-footbridge/cats-pci.c +++ b/arch/arm/mach-footbridge/cats-pci.c | |||
@@ -16,6 +16,11 @@ | |||
16 | /* cats host-specific stuff */ | 16 | /* cats host-specific stuff */ |
17 | static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 }; | 17 | static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 }; |
18 | 18 | ||
19 | static u8 cats_no_swizzle(struct pci_dev *dev, u8 *pin) | ||
20 | { | ||
21 | return 0; | ||
22 | } | ||
23 | |||
19 | static int __init cats_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | 24 | static int __init cats_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
20 | { | 25 | { |
21 | if (dev->irq >= 255) | 26 | if (dev->irq >= 255) |
@@ -39,7 +44,7 @@ static int __init cats_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | |||
39 | * cards being used (ie, pci-pci bridge based cards)? | 44 | * cards being used (ie, pci-pci bridge based cards)? |
40 | */ | 45 | */ |
41 | static struct hw_pci cats_pci __initdata = { | 46 | static struct hw_pci cats_pci __initdata = { |
42 | .swizzle = NULL, | 47 | .swizzle = cats_no_swizzle, |
43 | .map_irq = cats_map_irq, | 48 | .map_irq = cats_map_irq, |
44 | .nr_controllers = 1, | 49 | .nr_controllers = 1, |
45 | .setup = dc21285_setup, | 50 | .setup = dc21285_setup, |