diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2014-10-27 03:15:25 -0400 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2014-10-27 03:29:54 -0400 |
| commit | 70dcd942dc4af3cc6c3dcc2ba499cd841c7f65a7 (patch) | |
| tree | 782789c97aefa5009de55c946e03ba032b5034b9 | |
| parent | 4cbbbb43d666468d87f99676cf05fb5154d1228b (diff) | |
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.c | 9 |
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, | |||
| 660 | res = &hose->mem_resources[memno++]; | 660 | res = &hose->mem_resources[memno++]; |
| 661 | break; | 661 | break; |
| 662 | } | 662 | } |
| 663 | if (res != NULL) | 663 | if (res != NULL) { |
| 664 | of_pci_range_to_resource(&range, dev, res); | 664 | res->name = dev->full_name; |
| 665 | res->flags = range.flags; | ||
| 666 | res->start = range.cpu_addr; | ||
| 667 | res->end = range.cpu_addr + range.size - 1; | ||
| 668 | res->parent = res->child = res->sibling = NULL; | ||
| 669 | } | ||
| 665 | } | 670 | } |
| 666 | 671 | ||
| 667 | /* If there's an ISA hole and the pci_mem_offset is -not- matching | 672 | /* If there's an ISA hole and the pci_mem_offset is -not- matching |
