diff options
Diffstat (limited to 'arch/mips/ath79/pci.c')
-rw-r--r-- | arch/mips/ath79/pci.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/mips/ath79/pci.c b/arch/mips/ath79/pci.c index bc40070e45c9..ca83abd9d31e 100644 --- a/arch/mips/ath79/pci.c +++ b/arch/mips/ath79/pci.c | |||
@@ -14,6 +14,7 @@ | |||
14 | 14 | ||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
17 | #include <asm/mach-ath79/ar71xx_regs.h> | ||
17 | #include <asm/mach-ath79/ath79.h> | 18 | #include <asm/mach-ath79/ath79.h> |
18 | #include <asm/mach-ath79/irq.h> | 19 | #include <asm/mach-ath79/irq.h> |
19 | #include <asm/mach-ath79/pci.h> | 20 | #include <asm/mach-ath79/pci.h> |
@@ -57,7 +58,9 @@ int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin) | |||
57 | if (soc_is_ar71xx()) { | 58 | if (soc_is_ar71xx()) { |
58 | ath79_pci_irq_map = ar71xx_pci_irq_map; | 59 | ath79_pci_irq_map = ar71xx_pci_irq_map; |
59 | ath79_pci_nr_irqs = ARRAY_SIZE(ar71xx_pci_irq_map); | 60 | ath79_pci_nr_irqs = ARRAY_SIZE(ar71xx_pci_irq_map); |
60 | } else if (soc_is_ar724x()) { | 61 | } else if (soc_is_ar724x() || |
62 | soc_is_ar9342() || | ||
63 | soc_is_ar9344()) { | ||
61 | ath79_pci_irq_map = ar724x_pci_irq_map; | 64 | ath79_pci_irq_map = ar724x_pci_irq_map; |
62 | ath79_pci_nr_irqs = ARRAY_SIZE(ar724x_pci_irq_map); | 65 | ath79_pci_nr_irqs = ARRAY_SIZE(ar724x_pci_irq_map); |
63 | } else { | 66 | } else { |
@@ -115,5 +118,13 @@ int __init ath79_register_pci(void) | |||
115 | if (soc_is_ar724x()) | 118 | if (soc_is_ar724x()) |
116 | return ar724x_pcibios_init(ATH79_CPU_IRQ_IP2); | 119 | return ar724x_pcibios_init(ATH79_CPU_IRQ_IP2); |
117 | 120 | ||
121 | if (soc_is_ar9342() || soc_is_ar9344()) { | ||
122 | u32 bootstrap; | ||
123 | |||
124 | bootstrap = ath79_reset_rr(AR934X_RESET_REG_BOOTSTRAP); | ||
125 | if (bootstrap & AR934X_BOOTSTRAP_PCIE_RC) | ||
126 | return ar724x_pcibios_init(ATH79_IP2_IRQ(0)); | ||
127 | } | ||
128 | |||
118 | return -ENODEV; | 129 | return -ENODEV; |
119 | } | 130 | } |