summaryrefslogtreecommitdiffstats
path: root/arch/mips/pci
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-04-04 20:01:23 +0200
committerBjorn Helgaas <bhelgaas@google.com>2013-04-10 10:20:49 -0600
commit9a97cd43f4ef62520a852b5a2348233b0f37455b (patch)
tree8d0a1e987664c479e7bb312f3026fac934c0c267 /arch/mips/pci
parent10629d711ed780470937ecda50d9ffa0e925a4ee (diff)
downloadop-kernel-dev-9a97cd43f4ef62520a852b5a2348233b0f37455b.zip
op-kernel-dev-9a97cd43f4ef62520a852b5a2348233b0f37455b.tar.gz
MIPS/PCI: Implement pcibios_get_phb_of_node
The of_node field of the device assigned to a PCI bus is used during scanning of the PCI bus. However on MIPS, the of_node field is assigned only after the bus has been scanned. Implement the architecture specific version of 'pcibios_get_phb_of_node'. Which ensures that the PCI driver core will initialize the of_node field before starting the scan. Also remove the local assignment of bus->dev.of_node, it is not needed after the patch. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/mips/pci')
-rw-r--r--arch/mips/pci/pci.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 0872f12..594e60d 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -115,7 +115,6 @@ static void pcibios_scanbus(struct pci_controller *hose)
pci_bus_assign_resources(bus);
pci_enable_bridges(bus);
}
- bus->dev.of_node = hose->of_node;
}
}
@@ -169,6 +168,13 @@ void pci_load_of_ranges(struct pci_controller *hose, struct device_node *node)
}
}
}
+
+struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus)
+{
+ struct pci_controller *hose = bus->sysdata;
+
+ return of_node_get(hose->of_node);
+}
#endif
static DEFINE_MUTEX(pci_scan_mutex);
OpenPOWER on IntegriCloud