From bc42414632301d0db78b27c8d6ef3fd89c341890 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 16 May 2014 10:19:50 +0200
Subject: fix pci problem
---
.../mikrotik-rb532/patches/3.14.3/rb532-pci.patch | 26 ----------------------
.../mikrotik-rb532/patches/3.14.4/rb532-pci.patch | 11 +++++++++
2 files changed, 11 insertions(+), 26 deletions(-)
delete mode 100644 target/mips/mikrotik-rb532/patches/3.14.3/rb532-pci.patch
create mode 100644 target/mips/mikrotik-rb532/patches/3.14.4/rb532-pci.patch
(limited to 'target/mips')
diff --git a/target/mips/mikrotik-rb532/patches/3.14.3/rb532-pci.patch b/target/mips/mikrotik-rb532/patches/3.14.3/rb532-pci.patch
deleted file mode 100644
index c00453f36..000000000
--- a/target/mips/mikrotik-rb532/patches/3.14.3/rb532-pci.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur linux-3.14.3.orig/arch/mips/pci/pci.c linux-3.14.3/arch/mips/pci/pci.c
---- linux-3.14.3.orig/arch/mips/pci/pci.c 2014-05-06 16:59:58.000000000 +0200
-+++ linux-3.14.3/arch/mips/pci/pci.c 2014-05-11 10:13:26.000000000 +0200
-@@ -166,20 +166,10 @@
-
- void register_pci_controller(struct pci_controller *hose)
- {
-- struct resource *parent;
--
-- parent = hose->mem_resource->parent;
-- if (!parent)
-- parent = &iomem_resource;
--
-- if (request_resource(parent, hose->mem_resource) < 0)
-+ if (request_resource(&iomem_resource, hose->mem_resource) < 0)
- goto out;
-
-- parent = hose->io_resource->parent;
-- if (!parent)
-- parent = &ioport_resource;
--
-- if (request_resource(parent, hose->io_resource) < 0) {
-+ if (request_resource(&ioport_resource, hose->io_resource) < 0) {
- release_resource(hose->mem_resource);
- goto out;
- }
diff --git a/target/mips/mikrotik-rb532/patches/3.14.4/rb532-pci.patch b/target/mips/mikrotik-rb532/patches/3.14.4/rb532-pci.patch
new file mode 100644
index 000000000..adfa652b5
--- /dev/null
+++ b/target/mips/mikrotik-rb532/patches/3.14.4/rb532-pci.patch
@@ -0,0 +1,11 @@
+diff -Nur linux-3.14.3.orig/arch/mips/pci/pci-rc32434.c linux-3.14.3/arch/mips/pci/pci-rc32434.c
+--- linux-3.14.3.orig/arch/mips/pci/pci-rc32434.c 2014-05-06 16:59:58.000000000 +0200
++++ linux-3.14.3/arch/mips/pci/pci-rc32434.c 2014-05-13 17:15:48.000000000 +0200
+@@ -53,7 +53,6 @@
+ .start = 0x50000000,
+ .end = 0x5FFFFFFF,
+ .flags = IORESOURCE_MEM,
+- .parent = &rc32434_res_pci_mem1,
+ .sibling = NULL,
+ .child = &rc32434_res_pci_mem2
+ };
--
cgit v1.2.3