Merge tag 'batadv-net-for-davem-20190821' of git://git.open-mesh.org/linux-merge

[linux-2.6-microblaze.git] / drivers / pci / of.c

diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index 73d5ade..bc7b27a 100644 (file)
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -22,12 +22,15 @@ void pci_set_of_node(struct pci_dev *dev)
                return;
        dev->dev.of_node = of_pci_find_child_device(dev->bus->dev.of_node,
                                                    dev->devfn);
+       if (dev->dev.of_node)
+               dev->dev.fwnode = &dev->dev.of_node->fwnode;
 }
 
 void pci_release_of_node(struct pci_dev *dev)
 {
        of_node_put(dev->dev.of_node);
        dev->dev.of_node = NULL;
+       dev->dev.fwnode = NULL;
 }
 
 void pci_set_bus_of_node(struct pci_bus *bus)
@@ -41,13 +44,18 @@ void pci_set_bus_of_node(struct pci_bus *bus)
                if (node && of_property_read_bool(node, "external-facing"))
                        bus->self->untrusted = true;
        }
+
        bus->dev.of_node = node;
+
+       if (bus->dev.of_node)
+               bus->dev.fwnode = &bus->dev.of_node->fwnode;
 }
 
 void pci_release_bus_of_node(struct pci_bus *bus)
 {
        of_node_put(bus->dev.of_node);
        bus->dev.of_node = NULL;
+       bus->dev.fwnode = NULL;
 }
 
 struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus)