diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-04-04 14:01:23 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-10 12:20:49 -0400 |
commit | 9a97cd43f4ef62520a852b5a2348233b0f37455b (patch) | |
tree | 8d0a1e987664c479e7bb312f3026fac934c0c267 /arch/mips/pci/pci.c | |
parent | 10629d711ed780470937ecda50d9ffa0e925a4ee (diff) |
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/pci.c')
-rw-r--r-- | arch/mips/pci/pci.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index 0872f12f268d..594e60d6a43b 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) | |||
115 | pci_bus_assign_resources(bus); | 115 | pci_bus_assign_resources(bus); |
116 | pci_enable_bridges(bus); | 116 | pci_enable_bridges(bus); |
117 | } | 117 | } |
118 | bus->dev.of_node = hose->of_node; | ||
119 | } | 118 | } |
120 | } | 119 | } |
121 | 120 | ||
@@ -169,6 +168,13 @@ void pci_load_of_ranges(struct pci_controller *hose, struct device_node *node) | |||
169 | } | 168 | } |
170 | } | 169 | } |
171 | } | 170 | } |
171 | |||
172 | struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus) | ||
173 | { | ||
174 | struct pci_controller *hose = bus->sysdata; | ||
175 | |||
176 | return of_node_get(hose->of_node); | ||
177 | } | ||
172 | #endif | 178 | #endif |
173 | 179 | ||
174 | static DEFINE_MUTEX(pci_scan_mutex); | 180 | static DEFINE_MUTEX(pci_scan_mutex); |