diff options
author | Jon Medhurst <tixy@linaro.org> | 2015-07-21 10:24:55 +0100 |
---|---|---|
committer | Jon Medhurst <tixy@linaro.org> | 2015-07-21 10:24:55 +0100 |
commit | 595cb61bb04e4def3c5b35390e7109efbca745d2 (patch) | |
tree | 865a950b6487b5343f218232628d4695860d6cb0 /drivers/pci/of.c | |
parent | c1474bfe3752c55b9bbcaab067db21a06e9291e3 (diff) | |
parent | 7d53c0509545fbf18e47f43f2d81e297d36b6702 (diff) |
Merge branch 'tracking-armlt-juno-pci' into integration-linaro-vexpress64tracking-integration-linaro-vexpress-ll-20150721.0
Diffstat (limited to 'drivers/pci/of.c')
-rw-r--r-- | drivers/pci/of.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/pci/of.c b/drivers/pci/of.c index f0929934bb7a..75bfb854337e 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -9,6 +9,7 @@ * 2 of the License, or (at your option) any later version. */ +#include <linux/irqdomain.h> #include <linux/kernel.h> #include <linux/pci.h> #include <linux/of.h> @@ -59,3 +60,22 @@ struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus) return of_node_get(bus->bridge->parent->of_node); return NULL; } + +void pci_set_phb_of_msi_domain(struct pci_bus *bus) +{ +#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN + struct device_node *np; + + if (!bus->dev.of_node) + return; + /* Start looking for a phandle to an MSI controller. */ + np = of_parse_phandle(bus->dev.of_node, "msi-parent", 0); + /* + * If we don't have an msi-parent property, look for a domain + * directly attached to the host bridge. + */ + if (!np) + np = bus->dev.of_node; + dev_set_msi_domain(&bus->dev, irq_find_host(np)); +#endif +} |