115 lines
3.5 KiB
Diff
115 lines
3.5 KiB
Diff
From bc14333054c5ecee4bc7e8760d0ffbb730f32c54 Mon Sep 17 00:00:00 2001
|
|
From: Gabor Juhos <juhosg@openwrt.org>
|
|
Date: Fri, 15 Feb 2013 13:38:23 +0000
|
|
Subject: [PATCH] MIPS: ath79: add PCI controller registration code for the
|
|
QCA955X SoCs
|
|
|
|
commit 0a5f3b1c9f20eb44142e3b37662de15c944f759d upstream.
|
|
|
|
Add SoC specific PCI IRQ map, and register platform
|
|
devices for the two built-in PCIe RCs.
|
|
|
|
Cc: Rodriguez, Luis <rodrigue@qca.qualcomm.com>
|
|
Cc: Giori, Kathy <kgiori@qca.qualcomm.com>
|
|
Cc: QCA Linux Team <qca-linux-team@qca.qualcomm.com>
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
Patchwork: http://patchwork.linux-mips.org/patch/4951/
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
---
|
|
arch/mips/ath79/Kconfig | 2 ++
|
|
arch/mips/ath79/pci.c | 36 ++++++++++++++++++++++++
|
|
arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 13 +++++++++
|
|
3 files changed, 51 insertions(+)
|
|
|
|
--- a/arch/mips/ath79/Kconfig
|
|
+++ b/arch/mips/ath79/Kconfig
|
|
@@ -90,6 +90,8 @@ config SOC_AR934X
|
|
|
|
config SOC_QCA955X
|
|
select USB_ARCH_HAS_EHCI
|
|
+ select HW_HAS_PCI
|
|
+ select PCI_AR724X if PCI
|
|
def_bool n
|
|
|
|
config PCI_AR724X
|
|
--- a/arch/mips/ath79/pci.c
|
|
+++ b/arch/mips/ath79/pci.c
|
|
@@ -49,6 +49,21 @@ static const struct ath79_pci_irq ar724x
|
|
}
|
|
};
|
|
|
|
+static const struct ath79_pci_irq qca955x_pci_irq_map[] __initconst = {
|
|
+ {
|
|
+ .bus = 0,
|
|
+ .slot = 0,
|
|
+ .pin = 1,
|
|
+ .irq = ATH79_PCI_IRQ(0),
|
|
+ },
|
|
+ {
|
|
+ .bus = 1,
|
|
+ .slot = 0,
|
|
+ .pin = 1,
|
|
+ .irq = ATH79_PCI_IRQ(1),
|
|
+ },
|
|
+};
|
|
+
|
|
int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
|
|
{
|
|
int irq = -1;
|
|
@@ -64,6 +79,9 @@ int __init pcibios_map_irq(const struct
|
|
soc_is_ar9344()) {
|
|
ath79_pci_irq_map = ar724x_pci_irq_map;
|
|
ath79_pci_nr_irqs = ARRAY_SIZE(ar724x_pci_irq_map);
|
|
+ } else if (soc_is_qca955x()) {
|
|
+ ath79_pci_irq_map = qca955x_pci_irq_map;
|
|
+ ath79_pci_nr_irqs = ARRAY_SIZE(qca955x_pci_irq_map);
|
|
} else {
|
|
pr_crit("pci %s: invalid irq map\n",
|
|
pci_name((struct pci_dev *) dev));
|
|
@@ -225,6 +243,24 @@ int __init ath79_register_pci(void)
|
|
AR724X_PCI_MEM_SIZE,
|
|
0,
|
|
ATH79_IP2_IRQ(0));
|
|
+ } else if (soc_is_qca9558()) {
|
|
+ pdev = ath79_register_pci_ar724x(0,
|
|
+ QCA955X_PCI_CFG_BASE0,
|
|
+ QCA955X_PCI_CTRL_BASE0,
|
|
+ QCA955X_PCI_CRP_BASE0,
|
|
+ QCA955X_PCI_MEM_BASE0,
|
|
+ QCA955X_PCI_MEM_SIZE,
|
|
+ 0,
|
|
+ ATH79_IP2_IRQ(0));
|
|
+
|
|
+ pdev = ath79_register_pci_ar724x(1,
|
|
+ QCA955X_PCI_CFG_BASE1,
|
|
+ QCA955X_PCI_CTRL_BASE1,
|
|
+ QCA955X_PCI_CRP_BASE1,
|
|
+ QCA955X_PCI_MEM_BASE1,
|
|
+ QCA955X_PCI_MEM_SIZE,
|
|
+ 1,
|
|
+ ATH79_IP3_IRQ(2));
|
|
} else {
|
|
/* No PCI support */
|
|
return -ENODEV;
|
|
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
|
|
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
|
|
@@ -94,6 +94,19 @@
|
|
#define AR934X_SRIF_BASE (AR71XX_APB_BASE + 0x00116000)
|
|
#define AR934X_SRIF_SIZE 0x1000
|
|
|
|
+#define QCA955X_PCI_MEM_BASE0 0x10000000
|
|
+#define QCA955X_PCI_MEM_BASE1 0x12000000
|
|
+#define QCA955X_PCI_MEM_SIZE 0x02000000
|
|
+#define QCA955X_PCI_CFG_BASE0 0x14000000
|
|
+#define QCA955X_PCI_CFG_BASE1 0x16000000
|
|
+#define QCA955X_PCI_CFG_SIZE 0x1000
|
|
+#define QCA955X_PCI_CRP_BASE0 (AR71XX_APB_BASE + 0x000c0000)
|
|
+#define QCA955X_PCI_CRP_BASE1 (AR71XX_APB_BASE + 0x00250000)
|
|
+#define QCA955X_PCI_CRP_SIZE 0x1000
|
|
+#define QCA955X_PCI_CTRL_BASE0 (AR71XX_APB_BASE + 0x000f0000)
|
|
+#define QCA955X_PCI_CTRL_BASE1 (AR71XX_APB_BASE + 0x00280000)
|
|
+#define QCA955X_PCI_CTRL_SIZE 0x100
|
|
+
|
|
#define QCA955X_WMAC_BASE (AR71XX_APB_BASE + 0x00100000)
|
|
#define QCA955X_WMAC_SIZE 0x20000
|
|
|