diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-31 22:56:35 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-31 22:56:35 -0700 |
| commit | 4abbb75b6d77dc3d48d18abfc2d75c652cf432e3 (patch) | |
| tree | 546989da02e3e7d0eee8c763a30f8216bbbdc87e /include/linux/of_pci.h | |
| parent | b54338b30e0caa6212a409c1abb0856bed75643e (diff) | |
| parent | 4e23d3f505e8acfeac7cc33d4113fbb5a25c3090 (diff) | |
Merge tag 'of_pci-3.11' of git://git.infradead.org/users/jcooper/linux into next/cleanup
From Jason Cooper, of/pci changes for v3.11.
The patches had Reviewed-by: from Rob Herring on the lists, but seems to
have been missed from the commit messages. These will be required as a base
for some of the other functionality in this merge window, so taking it through
arm-soc.
Signed-off-by: Olof Johansson <olof@lixom.net>
* tag 'of_pci-3.11' of git://git.infradead.org/users/jcooper/linux:
of/pci: Add of_pci_parse_bus_range() function
of/pci: Add of_pci_get_devfn() function
of/pci: Provide support for parsing PCI DT ranges property
Diffstat (limited to 'include/linux/of_pci.h')
| -rw-r--r-- | include/linux/of_pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h index bb115deb7612..7a04826018c0 100644 --- a/include/linux/of_pci.h +++ b/include/linux/of_pci.h @@ -10,5 +10,7 @@ int of_irq_map_pci(const struct pci_dev *pdev, struct of_irq *out_irq); struct device_node; struct device_node *of_pci_find_child_device(struct device_node *parent, unsigned int devfn); +int of_pci_get_devfn(struct device_node *np); +int of_pci_parse_bus_range(struct device_node *node, struct resource *res); #endif |