diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2018-10-06 15:45:07 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-10-06 15:45:07 +0200 |
| commit | a223464217737c6563c7986df67fe3b7a7aaff1e (patch) | |
| tree | 3a7d6c9c355f77389adde7d169c8d16dfebcbba0 /drivers/base | |
| parent | genirq/debugfs: Reinstate full OF path for domain name (diff) | |
| parent | irqchip/gic: Unify GIC priority definitions (diff) | |
| download | linux-dev-a223464217737c6563c7986df67fe3b7a7aaff1e.tar.xz linux-dev-a223464217737c6563c7986df67fe3b7a7aaff1e.zip | |
Merge tag 'irqchip-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull irqchip updates from Marc Zyngier:
- kexec/kdump support for EFI-based GICv3 platforms
- Marvell SEI support
- QC PDC fixes
- GIC cleanups and optimizations
- DT updates
[ tglx: Dropped the madera driver as it breaks the build ]
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/platform-msi.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/base/platform-msi.c b/drivers/base/platform-msi.c index 60d6cc618f1c..f39a920496fb 100644 --- a/drivers/base/platform-msi.c +++ b/drivers/base/platform-msi.c @@ -321,11 +321,12 @@ void *platform_msi_get_host_data(struct irq_domain *domain) * Returns an irqdomain for @nvec interrupts */ struct irq_domain * -platform_msi_create_device_domain(struct device *dev, - unsigned int nvec, - irq_write_msi_msg_t write_msi_msg, - const struct irq_domain_ops *ops, - void *host_data) +__platform_msi_create_device_domain(struct device *dev, + unsigned int nvec, + bool is_tree, + irq_write_msi_msg_t write_msi_msg, + const struct irq_domain_ops *ops, + void *host_data) { struct platform_msi_priv_data *data; struct irq_domain *domain; @@ -336,7 +337,8 @@ platform_msi_create_device_domain(struct device *dev, return NULL; data->host_data = host_data; - domain = irq_domain_create_hierarchy(dev->msi_domain, 0, nvec, + domain = irq_domain_create_hierarchy(dev->msi_domain, 0, + is_tree ? 0 : nvec, dev->fwnode, ops, data); if (!domain) goto free_priv; |