Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[deliverable/linux.git] / arch / arm / mach-imx / tzic.c

diff --git a/arch/arm/mach-imx/tzic.c b/arch/arm/mach-imx/tzic.c
index a53fdc263a37dda204f83598907a91e5754bb65c..4ca37c3f1da47ba085721dfea1c0886f61c79218 100644 (file)
--- a/arch/arm/mach-imx/tzic.c
+++ b/arch/arm/mach-imx/tzic.c
@@ -55,14 +55,14 @@ static struct irq_domain *domain;
 #define TZIC_NUM_IRQS 128
 
 #ifdef CONFIG_FIQ
-static int tzic_set_irq_fiq(unsigned int irq, unsigned int type)
+static int tzic_set_irq_fiq(unsigned int hwirq, unsigned int type)
 {
        unsigned int index, mask, value;
 
-       index = irq >> 5;
+       index = hwirq >> 5;
        if (unlikely(index >= 4))
                return -EINVAL;
-       mask = 1U << (irq & 0x1F);
+       mask = 1U << (hwirq & 0x1F);
 
        value = imx_readl(tzic_base + TZIC_INTSEC0(index)) | mask;
        if (type)