summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-12-29 12:42:25 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-12-29 12:44:10 (GMT)
commita472b09dd5bb00f7da3087f2a324eb963e8eaa9f (patch)
tree604760992111dc5d4038d3c6ae7b8c6b997abc71
parent43024ed6fa831094b1e0eca7f18de372842ac9a1 (diff)
downloadlinux-a472b09dd5bb00f7da3087f2a324eb963e8eaa9f.tar.xz
ARM: PCI: add legacy IDE IRQ implementation
The IDE code used to specify the IDE IRQs for chipsets operating in legacy mode. This appears to no longer work, and this information must be provided by the arch. Do so. This partially fixes CY82C693 (and probably others) on Footbridge platforms. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/include/asm/pci.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h
index a98a2e1..680a83e 100644
--- a/arch/arm/include/asm/pci.h
+++ b/arch/arm/include/asm/pci.h
@@ -57,12 +57,9 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, int write_combine);
-/*
- * Dummy implementation; always return 0.
- */
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
{
- return 0;
+ return channel ? 15 : 14;
}
#endif /* __KERNEL__ */