Browse Source

fix pic register

Waldemar Brodkorb 10 years ago
parent
commit
91718c8e02
1 changed files with 11 additions and 26 deletions
  1. 11 26
      target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch

+ 11 - 26
target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch

@@ -1,26 +1,11 @@
-diff -Nur linux-3.15-rc5.orig/arch/mips/pci/pci.c linux-3.15-rc5/arch/mips/pci/pci.c
---- linux-3.15-rc5.orig/arch/mips/pci/pci.c	2014-05-09 22:10:52.000000000 +0200
-+++ linux-3.15-rc5/arch/mips/pci/pci.c	2014-05-10 21:18:58.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 -Nur linux-3.15-rc5.orig/arch/mips/pci/pci-rc32434.c linux-3.15-rc5/arch/mips/pci/pci-rc32434.c
+--- linux-3.15-rc5.orig/arch/mips/pci/pci-rc32434.c	2014-05-09 22:10:52.000000000 +0200
++++ linux-3.15-rc5/arch/mips/pci/pci-rc32434.c	2014-05-16 10:38:10.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
+ };