summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2014-10-27 08:15:25 +0100
committerMichal Simek <michal.simek@xilinx.com>2014-10-27 08:29:54 +0100
commit70dcd942dc4af3cc6c3dcc2ba499cd841c7f65a7 (patch)
tree782789c97aefa5009de55c946e03ba032b5034b9
parent4cbbbb43d666468d87f99676cf05fb5154d1228b (diff)
downloadlinux-70dcd942dc4af3cc6c3dcc2ba499cd841c7f65a7.tar.gz
microblaze: Fix IO space breakage after of_pci_range_to_resource() change
Commit 0b0b0893d49b "of/pci: Fix the conversion of IO ranges into IO
resources" changed the behaviour of of_pci_range_to_resource().

The issue is described here:
"powerpc/pci: Fix IO space breakage after of_pci_range_to_resource()
change"
(sha1: aeba3731b150188685225b510886f1370d8814de)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r--arch/microblaze/pci/pci-common.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index 9037914f6985..b30e41c0c033 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -660,8 +660,13 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
 			res = &hose->mem_resources[memno++];
 			break;
 		}
-		if (res != NULL)
-			of_pci_range_to_resource(&range, dev, res);
+		if (res != NULL) {
+			res->name = dev->full_name;
+			res->flags = range.flags;
+			res->start = range.cpu_addr;
+			res->end = range.cpu_addr + range.size - 1;
+			res->parent = res->child = res->sibling = NULL;
+		}
 	}
 
 	/* If there's an ISA hole and the pci_mem_offset is -not- matching