diff options
| author | Ke Qinghua <qinghua.ke@freescale.com> | 2014-06-20 16:48:42 +0800 |
|---|---|---|
| committer | Ke Qinghua <qinghua.ke@freescale.com> | 2014-06-20 17:31:51 +0800 |
| commit | 8c322078aa45e3b9f6c70bee4d883729a5a6b2f4 (patch) | |
| tree | 776466e7904f7459ca102d28cf4d5771a0ce81f1 /kernel | |
| parent | 5cd8cfe6a06d203a4b2c3fa473abcb79d23b8a0d (diff) | |
| parent | af51180cd6df6117cea5b87602373fa29a7ca557 (diff) | |
Merge remote-tracking branch 'remotes/fsl-linux-sdk/imx_3.10.y' into imx_3.10.y_android
Conflicts:
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/imx6sx.dtsi
arch/arm/mach-imx/clk-imx6sx.c
arch/arm/mach-imx/mach-imx6sx.c
drivers/dma/pxp/pxp_dma_v2.c
drivers/media/platform/mxc/capture/csi_v4l2_capture.c
drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h
drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c
drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_vg.c
drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c
drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h
drivers/pwm/pwm-imx.c
include/dt-bindings/clock/imx6sx-clock.h
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/irqdomain.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 54a4d5223238..16d5dfb0e336 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -655,15 +655,14 @@ int irq_create_strict_mappings(struct irq_domain *domain, unsigned int irq_base, } EXPORT_SYMBOL_GPL(irq_create_strict_mappings); -unsigned int irq_create_of_mapping(struct device_node *controller, - const u32 *intspec, unsigned int intsize) +unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data) { struct irq_domain *domain; irq_hw_number_t hwirq; unsigned int type = IRQ_TYPE_NONE; unsigned int virq; - domain = controller ? irq_find_host(controller) : irq_default_domain; + domain = irq_data->np ? irq_find_host(irq_data->np) : irq_default_domain; if (!domain) { #ifdef CONFIG_MIPS /* @@ -678,16 +677,16 @@ unsigned int irq_create_of_mapping(struct device_node *controller, return intspec[0]; #endif pr_warning("no irq domain found for %s !\n", - of_node_full_name(controller)); + of_node_full_name(irq_data->np)); return 0; } /* If domain has no translation, then we assume interrupt line */ if (domain->ops->xlate == NULL) - hwirq = intspec[0]; + hwirq = irq_data->args[0]; else { - if (domain->ops->xlate(domain, controller, intspec, intsize, - &hwirq, &type)) + if (domain->ops->xlate(domain, irq_data->np, irq_data->args, + irq_data->args_count, &hwirq, &type)) return 0; } |