summaryrefslogtreecommitdiff
path: root/target/linux/ar71xx/patches-3.7/146-MIPS-ath79-register-platform-devices-for-the-PCI-con.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-04 09:03:50 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-04 09:03:50 +0000
commite7b0e9b9305253a5e9f9d156e95c0bf1b1e44a85 (patch)
treecdb5bbd7b5073739fd245dcec5aab478515c649b /target/linux/ar71xx/patches-3.7/146-MIPS-ath79-register-platform-devices-for-the-PCI-con.patch
parent1d3c0dd40e71b6aa15d0d8514f797656ffed4a70 (diff)
ar71xx: remove 3.7 support
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35870 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.7/146-MIPS-ath79-register-platform-devices-for-the-PCI-con.patch')
-rw-r--r--target/linux/ar71xx/patches-3.7/146-MIPS-ath79-register-platform-devices-for-the-PCI-con.patch119
1 files changed, 0 insertions, 119 deletions
diff --git a/target/linux/ar71xx/patches-3.7/146-MIPS-ath79-register-platform-devices-for-the-PCI-con.patch b/target/linux/ar71xx/patches-3.7/146-MIPS-ath79-register-platform-devices-for-the-PCI-con.patch
deleted file mode 100644
index cc2572f88e..0000000000
--- a/target/linux/ar71xx/patches-3.7/146-MIPS-ath79-register-platform-devices-for-the-PCI-con.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 2fdf8dcff3ffaa806e9f9d7f1c1bd876222cff4d Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Mon, 11 Jun 2012 13:39:32 +0200
-Subject: [PATCH 07/34] MIPS: ath79: register platform devices for the PCI controllers
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- arch/mips/ath79/pci.c | 87 +++++++++++++++++++++++++++++++++++++++++++-----
- 1 files changed, 78 insertions(+), 9 deletions(-)
-
---- a/arch/mips/ath79/pci.c
-+++ b/arch/mips/ath79/pci.c
-@@ -14,6 +14,8 @@
-
- #include <linux/init.h>
- #include <linux/pci.h>
-+#include <linux/resource.h>
-+#include <linux/platform_device.h>
- #include <asm/mach-ath79/ar71xx_regs.h>
- #include <asm/mach-ath79/ath79.h>
- #include <asm/mach-ath79/irq.h>
-@@ -110,21 +112,88 @@ void __init ath79_pci_set_plat_dev_init(
- ath79_pci_plat_dev_init = func;
- }
-
--int __init ath79_register_pci(void)
-+static struct platform_device *
-+ath79_register_pci_ar71xx(void)
- {
-- if (soc_is_ar71xx())
-- return ar71xx_pcibios_init();
-+ struct platform_device *pdev;
-+ struct resource res[2];
-+
-+ memset(res, 0, sizeof(res));
-
-- if (soc_is_ar724x())
-- return ar724x_pcibios_init(ATH79_CPU_IRQ_IP2);
-+ res[0].name = "cfg_base";
-+ res[0].flags = IORESOURCE_MEM;
-+ res[0].start = AR71XX_PCI_CFG_BASE;
-+ res[0].end = AR71XX_PCI_CFG_BASE + AR71XX_PCI_CFG_SIZE - 1;
-+
-+ res[1].flags = IORESOURCE_IRQ;
-+ res[1].start = ATH79_CPU_IRQ_IP2;
-+ res[1].end = ATH79_CPU_IRQ_IP2;
-+
-+ pdev = platform_device_register_simple("ar71xx-pci", -1,
-+ res, ARRAY_SIZE(res));
-+ return pdev;
-+}
-
-- if (soc_is_ar9342() || soc_is_ar9344()) {
-+static struct platform_device *
-+ath79_register_pci_ar724x(int id,
-+ unsigned long cfg_base,
-+ unsigned long ctrl_base,
-+ int irq)
-+{
-+ struct platform_device *pdev;
-+ struct resource res[3];
-+
-+ memset(res, 0, sizeof(res));
-+
-+ res[0].name = "cfg_base";
-+ res[0].flags = IORESOURCE_MEM;
-+ res[0].start = cfg_base;
-+ res[0].end = cfg_base + AR724X_PCI_CFG_SIZE - 1;
-+
-+ res[1].name = "ctrl_base";
-+ res[1].flags = IORESOURCE_MEM;
-+ res[1].start = ctrl_base;
-+ res[1].end = ctrl_base + AR724X_PCI_CTRL_SIZE - 1;
-+
-+ res[2].flags = IORESOURCE_IRQ;
-+ res[2].start = irq;
-+ res[2].end = irq;
-+
-+ pdev = platform_device_register_simple("ar724x-pci", id,
-+ res, ARRAY_SIZE(res));
-+ return pdev;
-+}
-+
-+int __init ath79_register_pci(void)
-+{
-+ struct platform_device *pdev = NULL;
-+
-+ if (soc_is_ar71xx()) {
-+ pdev = ath79_register_pci_ar71xx();
-+ } else if (soc_is_ar724x()) {
-+ pdev = ath79_register_pci_ar724x(-1,
-+ AR724X_PCI_CFG_BASE,
-+ AR724X_PCI_CTRL_BASE,
-+ ATH79_CPU_IRQ_IP2);
-+ } else if (soc_is_ar9342() ||
-+ soc_is_ar9344()) {
- u32 bootstrap;
-
- bootstrap = ath79_reset_rr(AR934X_RESET_REG_BOOTSTRAP);
-- if (bootstrap & AR934X_BOOTSTRAP_PCIE_RC)
-- return ar724x_pcibios_init(ATH79_IP2_IRQ(0));
-+ if ((bootstrap & AR934X_BOOTSTRAP_PCIE_RC) == 0)
-+ return -ENODEV;
-+
-+ pdev = ath79_register_pci_ar724x(-1,
-+ AR724X_PCI_CFG_BASE,
-+ AR724X_PCI_CTRL_BASE,
-+ ATH79_IP2_IRQ(0));
-+ } else {
-+ /* No PCI support */
-+ return -ENODEV;
- }
-
-- return -ENODEV;
-+ if (!pdev)
-+ pr_err("unable to register PCI controller device\n");
-+
-+ return pdev ? 0 : -ENODEV;
- }