mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq updates from Thomas Gleixner:
"This updated pull request does not contain the last few GIC related
patches which were reported to cause a regression. There is a fix
available, but I let it breed for a couple of days first.
The irq departement provides:
- new infrastructure to support non PCI based MSI interrupts
- a couple of new irq chip drivers
- the usual pile of fixlets and updates to irq chip drivers
- preparatory changes for removal of the irq argument from interrupt
flow handlers
- preparatory changes to remove IRQF_VALID"
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (129 commits)
irqchip/imx-gpcv2: IMX GPCv2 driver for wakeup sources
irqchip: Add bcm2836 interrupt controller for Raspberry Pi 2
irqchip: Add documentation for the bcm2836 interrupt controller
irqchip/bcm2835: Add support for being used as a second level controller
irqchip/bcm2835: Refactor handle_IRQ() calls out of MAKE_HWIRQ
PCI: xilinx: Fix typo in function name
irqchip/gic: Ensure gic_cpu_if_up/down() programs correct GIC instance
irqchip/gic: Only allow the primary GIC to set the CPU map
PCI/MSI: pci-xgene-msi: Consolidate chained IRQ handler install/remove
unicore32/irq: Prepare puv3_gpio_handler for irq argument removal
tile/pci_gx: Prepare trio_handle_level_irq for irq argument removal
m68k/irq: Prepare irq handlers for irq argument removal
C6X/megamode-pic: Prepare megamod_irq_cascade for irq argument removal
blackfin: Prepare irq handlers for irq argument removal
arc/irq: Prepare idu_cascade_isr for irq argument removal
sparc/irq: Use access helper irq_data_get_affinity_mask()
sparc/irq: Use helper irq_data_get_irq_handler_data()
parisc/irq: Use access helper irq_data_get_affinity_mask()
mn10300/irq: Use access helper irq_data_get_affinity_mask()
irqchip/i8259: Prepare i8259_irq_dispatch for irq argument removal
...
This commit is contained in:
commit
17e6b00ac4
161 changed files with 2211 additions and 852 deletions
|
|
@ -18,6 +18,7 @@
|
|||
* driver.
|
||||
*/
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/module.h>
|
||||
|
|
@ -576,3 +577,23 @@ err:
|
|||
kfree(desc);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* of_msi_configure - Set the msi_domain field of a device
|
||||
* @dev: device structure to associate with an MSI irq domain
|
||||
* @np: device node for that device
|
||||
*/
|
||||
void of_msi_configure(struct device *dev, struct device_node *np)
|
||||
{
|
||||
struct device_node *msi_np;
|
||||
struct irq_domain *d;
|
||||
|
||||
msi_np = of_parse_phandle(np, "msi-parent", 0);
|
||||
if (!msi_np)
|
||||
return;
|
||||
|
||||
d = irq_find_matching_host(msi_np, DOMAIN_BUS_PLATFORM_MSI);
|
||||
if (!d)
|
||||
d = irq_find_host(msi_np);
|
||||
dev_set_msi_domain(dev, d);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -184,6 +184,7 @@ static struct platform_device *of_platform_device_create_pdata(
|
|||
dev->dev.bus = &platform_bus_type;
|
||||
dev->dev.platform_data = platform_data;
|
||||
of_dma_configure(&dev->dev, dev->dev.of_node);
|
||||
of_msi_configure(&dev->dev, dev->dev.of_node);
|
||||
|
||||
if (of_device_add(dev) != 0) {
|
||||
of_dma_deconfigure(&dev->dev);
|
||||
|
|
|
|||
Loading…
Reference in a new issue