Commit 38c677cb authored by David Brownell's avatar David Brownell Committed by Russell King

[ARM] 3739/1: genirq updates: irq_chip, add and use irq_chip.name

Patch from David Brownell

ARM genirq cleanups/updates:

    - Start switching platforms to newer APIs
        * use "irq_chip" name, not "irqchip"
        * providing irq_chip.name

    - Show irq_chip.name in /proc/interrupts, like on x86.

This update a bit more than half of the ARM code.  The irq_chip.name
values were chosen to match docs (if I have them) or be otherwise
obvious ("FPGA", "CPLD", or matching the code).
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 49b1e3ea
...@@ -95,7 +95,8 @@ static void gic_set_cpu(unsigned int irq, cpumask_t mask_val) ...@@ -95,7 +95,8 @@ static void gic_set_cpu(unsigned int irq, cpumask_t mask_val)
} }
#endif #endif
static struct irqchip gic_chip = { static struct irq_chip gic_chip = {
.name = "GIC",
.ack = gic_ack_irq, .ack = gic_ack_irq,
.mask = gic_mask_irq, .mask = gic_mask_irq,
.unmask = gic_unmask_irq, .unmask = gic_unmask_irq,
......
...@@ -204,7 +204,8 @@ static void locomo_unmask_irq(unsigned int irq) ...@@ -204,7 +204,8 @@ static void locomo_unmask_irq(unsigned int irq)
locomo_writel(r, mapbase + LOCOMO_ICR); locomo_writel(r, mapbase + LOCOMO_ICR);
} }
static struct irqchip locomo_chip = { static struct irq_chip locomo_chip = {
.name = "LOCOMO",
.ack = locomo_ack_irq, .ack = locomo_ack_irq,
.mask = locomo_mask_irq, .mask = locomo_mask_irq,
.unmask = locomo_unmask_irq, .unmask = locomo_unmask_irq,
...@@ -249,7 +250,8 @@ static void locomo_key_unmask_irq(unsigned int irq) ...@@ -249,7 +250,8 @@ static void locomo_key_unmask_irq(unsigned int irq)
locomo_writel(r, mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC); locomo_writel(r, mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
} }
static struct irqchip locomo_key_chip = { static struct irq_chip locomo_key_chip = {
.name = "LOCOMO-key",
.ack = locomo_key_ack_irq, .ack = locomo_key_ack_irq,
.mask = locomo_key_mask_irq, .mask = locomo_key_mask_irq,
.unmask = locomo_key_unmask_irq, .unmask = locomo_key_unmask_irq,
...@@ -312,7 +314,8 @@ static void locomo_gpio_unmask_irq(unsigned int irq) ...@@ -312,7 +314,8 @@ static void locomo_gpio_unmask_irq(unsigned int irq)
locomo_writel(r, mapbase + LOCOMO_GIE); locomo_writel(r, mapbase + LOCOMO_GIE);
} }
static struct irqchip locomo_gpio_chip = { static struct irq_chip locomo_gpio_chip = {
.name = "LOCOMO-gpio",
.ack = locomo_gpio_ack_irq, .ack = locomo_gpio_ack_irq,
.mask = locomo_gpio_mask_irq, .mask = locomo_gpio_mask_irq,
.unmask = locomo_gpio_unmask_irq, .unmask = locomo_gpio_unmask_irq,
...@@ -357,7 +360,8 @@ static void locomo_lt_unmask_irq(unsigned int irq) ...@@ -357,7 +360,8 @@ static void locomo_lt_unmask_irq(unsigned int irq)
locomo_writel(r, mapbase + LOCOMO_LTINT); locomo_writel(r, mapbase + LOCOMO_LTINT);
} }
static struct irqchip locomo_lt_chip = { static struct irq_chip locomo_lt_chip = {
.name = "LOCOMO-lt",
.ack = locomo_lt_ack_irq, .ack = locomo_lt_ack_irq,
.mask = locomo_lt_mask_irq, .mask = locomo_lt_mask_irq,
.unmask = locomo_lt_unmask_irq, .unmask = locomo_lt_unmask_irq,
...@@ -418,7 +422,8 @@ static void locomo_spi_unmask_irq(unsigned int irq) ...@@ -418,7 +422,8 @@ static void locomo_spi_unmask_irq(unsigned int irq)
locomo_writel(r, mapbase + LOCOMO_SPIIE); locomo_writel(r, mapbase + LOCOMO_SPIIE);
} }
static struct irqchip locomo_spi_chip = { static struct irq_chip locomo_spi_chip = {
.name = "LOCOMO-spi",
.ack = locomo_spi_ack_irq, .ack = locomo_spi_ack_irq,
.mask = locomo_spi_mask_irq, .mask = locomo_spi_mask_irq,
.unmask = locomo_spi_unmask_irq, .unmask = locomo_spi_unmask_irq,
......
...@@ -272,7 +272,8 @@ static int sa1111_wake_lowirq(unsigned int irq, unsigned int on) ...@@ -272,7 +272,8 @@ static int sa1111_wake_lowirq(unsigned int irq, unsigned int on)
return 0; return 0;
} }
static struct irqchip sa1111_low_chip = { static struct irq_chip sa1111_low_chip = {
.name = "SA1111-l",
.ack = sa1111_ack_irq, .ack = sa1111_ack_irq,
.mask = sa1111_mask_lowirq, .mask = sa1111_mask_lowirq,
.unmask = sa1111_unmask_lowirq, .unmask = sa1111_unmask_lowirq,
...@@ -368,7 +369,8 @@ static int sa1111_wake_highirq(unsigned int irq, unsigned int on) ...@@ -368,7 +369,8 @@ static int sa1111_wake_highirq(unsigned int irq, unsigned int on)
return 0; return 0;
} }
static struct irqchip sa1111_high_chip = { static struct irq_chip sa1111_high_chip = {
.name = "SA1111-h",
.ack = sa1111_ack_irq, .ack = sa1111_ack_irq,
.mask = sa1111_mask_highirq, .mask = sa1111_mask_highirq,
.unmask = sa1111_unmask_highirq, .unmask = sa1111_unmask_highirq,
......
...@@ -39,7 +39,8 @@ static void vic_unmask_irq(unsigned int irq) ...@@ -39,7 +39,8 @@ static void vic_unmask_irq(unsigned int irq)
writel(1 << irq, base + VIC_INT_ENABLE); writel(1 << irq, base + VIC_INT_ENABLE);
} }
static struct irqchip vic_chip = { static struct irq_chip vic_chip = {
.name = "VIC",
.ack = vic_mask_irq, .ack = vic_mask_irq,
.mask = vic_mask_irq, .mask = vic_mask_irq,
.unmask = vic_unmask_irq, .unmask = vic_unmask_irq,
......
...@@ -470,7 +470,8 @@ static void ecard_irq_mask(unsigned int irqnr) ...@@ -470,7 +470,8 @@ static void ecard_irq_mask(unsigned int irqnr)
} }
} }
static struct irqchip ecard_chip = { static struct irq_chip ecard_chip = {
.name = "ECARD",
.ack = ecard_irq_mask, .ack = ecard_irq_mask,
.mask = ecard_irq_mask, .mask = ecard_irq_mask,
.unmask = ecard_irq_unmask, .unmask = ecard_irq_unmask,
......
...@@ -77,6 +77,7 @@ int show_interrupts(struct seq_file *p, void *v) ...@@ -77,6 +77,7 @@ int show_interrupts(struct seq_file *p, void *v)
seq_printf(p, "%3d: ", i); seq_printf(p, "%3d: ", i);
for_each_present_cpu(cpu) for_each_present_cpu(cpu)
seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[i]); seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[i]);
seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-");
seq_printf(p, " %s", action->name); seq_printf(p, " %s", action->name);
for (action = action->next; action; action = action->next) for (action = action->next; action; action = action->next)
seq_printf(p, ", %s", action->name); seq_printf(p, ", %s", action->name);
......
...@@ -327,7 +327,8 @@ static int gpio_irq_type(unsigned pin, unsigned type) ...@@ -327,7 +327,8 @@ static int gpio_irq_type(unsigned pin, unsigned type)
return (type == IRQT_BOTHEDGE) ? 0 : -EINVAL; return (type == IRQT_BOTHEDGE) ? 0 : -EINVAL;
} }
static struct irqchip gpio_irqchip = { static struct irq_chip gpio_irqchip = {
.name = "GPIO",
.mask = gpio_irq_mask, .mask = gpio_irq_mask,
.unmask = gpio_irq_unmask, .unmask = gpio_irq_unmask,
.set_type = gpio_irq_type, .set_type = gpio_irq_type,
......
...@@ -114,7 +114,8 @@ void at91_irq_resume(void) ...@@ -114,7 +114,8 @@ void at91_irq_resume(void)
#define at91_aic_set_wake NULL #define at91_aic_set_wake NULL
#endif #endif
static struct irqchip at91_aic_chip = { static struct irq_chip at91_aic_chip = {
.name = "AIC",
.ack = at91_aic_mask_irq, .ack = at91_aic_mask_irq,
.mask = at91_aic_mask_irq, .mask = at91_aic_mask_irq,
.unmask = at91_aic_unmask_irq, .unmask = at91_aic_unmask_irq,
......
...@@ -204,13 +204,15 @@ imx_gpiod_demux_handler(unsigned int irq_unused, struct irqdesc *desc, ...@@ -204,13 +204,15 @@ imx_gpiod_demux_handler(unsigned int irq_unused, struct irqdesc *desc,
imx_gpio_handler(mask, irq, desc, regs); imx_gpio_handler(mask, irq, desc, regs);
} }
static struct irqchip imx_internal_chip = { static struct irq_chip imx_internal_chip = {
.name = "MPU",
.ack = imx_mask_irq, .ack = imx_mask_irq,
.mask = imx_mask_irq, .mask = imx_mask_irq,
.unmask = imx_unmask_irq, .unmask = imx_unmask_irq,
}; };
static struct irqchip imx_gpio_chip = { static struct irq_chip imx_gpio_chip = {
.name = "GPIO",
.ack = imx_gpio_ack_irq, .ack = imx_gpio_ack_irq,
.mask = imx_gpio_mask_irq, .mask = imx_gpio_mask_irq,
.unmask = imx_gpio_unmask_irq, .unmask = imx_gpio_unmask_irq,
......
...@@ -161,7 +161,8 @@ static void sc_unmask_irq(unsigned int irq) ...@@ -161,7 +161,8 @@ static void sc_unmask_irq(unsigned int irq)
writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_SET); writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_SET);
} }
static struct irqchip sc_chip = { static struct irq_chip sc_chip = {
.name = "SC",
.ack = sc_mask_irq, .ack = sc_mask_irq,
.mask = sc_mask_irq, .mask = sc_mask_irq,
.unmask = sc_unmask_irq, .unmask = sc_unmask_irq,
......
...@@ -156,7 +156,8 @@ static void cic_unmask_irq(unsigned int irq) ...@@ -156,7 +156,8 @@ static void cic_unmask_irq(unsigned int irq)
cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_SET); cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_SET);
} }
static struct irqchip cic_chip = { static struct irq_chip cic_chip = {
.name = "CIC",
.ack = cic_mask_irq, .ack = cic_mask_irq,
.mask = cic_mask_irq, .mask = cic_mask_irq,
.unmask = cic_unmask_irq, .unmask = cic_unmask_irq,
...@@ -174,7 +175,8 @@ static void pic_unmask_irq(unsigned int irq) ...@@ -174,7 +175,8 @@ static void pic_unmask_irq(unsigned int irq)
pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_SET); pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_SET);
} }
static struct irqchip pic_chip = { static struct irq_chip pic_chip = {
.name = "PIC",
.ack = pic_mask_irq, .ack = pic_mask_irq,
.mask = pic_mask_irq, .mask = pic_mask_irq,
.unmask = pic_unmask_irq, .unmask = pic_unmask_irq,
...@@ -192,7 +194,8 @@ static void sic_unmask_irq(unsigned int irq) ...@@ -192,7 +194,8 @@ static void sic_unmask_irq(unsigned int irq)
sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_SET); sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_SET);
} }
static struct irqchip sic_chip = { static struct irq_chip sic_chip = {
.name = "SIC",
.ack = sic_mask_irq, .ack = sic_mask_irq,
.mask = sic_mask_irq, .mask = sic_mask_irq,
.unmask = sic_unmask_irq, .unmask = sic_unmask_irq,
......
...@@ -52,7 +52,8 @@ iop321_irq_unmask (unsigned int irq) ...@@ -52,7 +52,8 @@ iop321_irq_unmask (unsigned int irq)
intctl_write(iop321_mask); intctl_write(iop321_mask);
} }
struct irqchip ext_chip = { struct irq_chip ext_chip = {
.name = "IOP",
.ack = iop321_irq_mask, .ack = iop321_irq_mask,
.mask = iop321_irq_mask, .mask = iop321_irq_mask,
.unmask = iop321_irq_unmask, .unmask = iop321_irq_unmask,
......
...@@ -77,13 +77,15 @@ iop331_irq_unmask2(unsigned int irq) ...@@ -77,13 +77,15 @@ iop331_irq_unmask2(unsigned int irq)
intctl_write1(iop331_mask1); intctl_write1(iop331_mask1);
} }
struct irqchip iop331_irqchip1 = { struct irq_chip iop331_irqchip1 = {
.name = "IOP-1",
.ack = iop331_irq_mask1, .ack = iop331_irq_mask1,
.mask = iop331_irq_mask1, .mask = iop331_irq_mask1,
.unmask = iop331_irq_unmask1, .unmask = iop331_irq_unmask1,
}; };
struct irqchip iop331_irqchip2 = { struct irq_chip iop331_irqchip2 = {
.name = "IOP-2",
.ack = iop331_irq_mask2, .ack = iop331_irq_mask2,
.mask = iop331_irq_mask2, .mask = iop331_irq_mask2,
.unmask = iop331_irq_unmask2, .unmask = iop331_irq_unmask2,
......
...@@ -63,7 +63,8 @@ static void kev7a400_unmask_cpld_irq (u32 irq) ...@@ -63,7 +63,8 @@ static void kev7a400_unmask_cpld_irq (u32 irq)
CPLD_WR_PB_INT_MASK = CPLD_IRQ_mask; CPLD_WR_PB_INT_MASK = CPLD_IRQ_mask;
} }
static struct irqchip kev7a400_cpld_chip = { static struct irq_chip kev7a400_cpld_chip = {
.name = "CPLD",
.ack = kev7a400_ack_cpld_irq, .ack = kev7a400_ack_cpld_irq,
.mask = kev7a400_mask_cpld_irq, .mask = kev7a400_mask_cpld_irq,
.unmask = kev7a400_unmask_cpld_irq, .unmask = kev7a400_unmask_cpld_irq,
......
...@@ -200,7 +200,8 @@ static void lh7a40x_unmask_cpld_irq (u32 irq) ...@@ -200,7 +200,8 @@ static void lh7a40x_unmask_cpld_irq (u32 irq)
} }
} }
static struct irqchip lpd7a40x_cpld_chip = { static struct irq_chip lpd7a40x_cpld_chip = {
.name = "CPLD",
.ack = lh7a40x_ack_cpld_irq, .ack = lh7a40x_ack_cpld_irq,
.mask = lh7a40x_mask_cpld_irq, .mask = lh7a40x_mask_cpld_irq,
.unmask = lh7a40x_unmask_cpld_irq, .unmask = lh7a40x_unmask_cpld_irq,
......
...@@ -43,7 +43,8 @@ lh7a400_unmask_cpld_irq (u32 irq) ...@@ -43,7 +43,8 @@ lh7a400_unmask_cpld_irq (u32 irq)
} }
static struct static struct
irqchip lh7a400_cpld_chip = { irq_chip lh7a400_cpld_chip = {
.name = "CPLD",
.ack = lh7a400_ack_cpld_irq, .ack = lh7a400_ack_cpld_irq,
.mask = lh7a400_mask_cpld_irq, .mask = lh7a400_mask_cpld_irq,
.unmask = lh7a400_unmask_cpld_irq, .unmask = lh7a400_unmask_cpld_irq,
......
...@@ -38,13 +38,15 @@ static void lh7a400_ack_gpio_irq (u32 irq) ...@@ -38,13 +38,15 @@ static void lh7a400_ack_gpio_irq (u32 irq)
INTC_INTENC = (1 << irq); INTC_INTENC = (1 << irq);
} }
static struct irqchip lh7a400_internal_chip = { static struct irq_chip lh7a400_internal_chip = {
.name = "MPU",
.ack = lh7a400_mask_irq, /* Level triggering -> mask is ack */ .ack = lh7a400_mask_irq, /* Level triggering -> mask is ack */
.mask = lh7a400_mask_irq, .mask = lh7a400_mask_irq,
.unmask = lh7a400_unmask_irq, .unmask = lh7a400_unmask_irq,
}; };
static struct irqchip lh7a400_gpio_chip = { static struct irq_chip lh7a400_gpio_chip = {
.name = "GPIO",
.ack = lh7a400_ack_gpio_irq, .ack = lh7a400_ack_gpio_irq,
.mask = lh7a400_mask_irq, .mask = lh7a400_mask_irq,
.unmask = lh7a400_unmask_irq, .unmask = lh7a400_unmask_irq,
......
...@@ -76,25 +76,29 @@ static void lh7a404_vic2_ack_gpio_irq (u32 irq) ...@@ -76,25 +76,29 @@ static void lh7a404_vic2_ack_gpio_irq (u32 irq)
VIC2_INTENCLR = (1 << irq); VIC2_INTENCLR = (1 << irq);
} }
static struct irqchip lh7a404_vic1_chip = { static struct irq_chip lh7a404_vic1_chip = {
.name = "VIC1",
.ack = lh7a404_vic1_mask_irq, /* Because level-triggered */ .ack = lh7a404_vic1_mask_irq, /* Because level-triggered */
.mask = lh7a404_vic1_mask_irq, .mask = lh7a404_vic1_mask_irq,
.unmask = lh7a404_vic1_unmask_irq, .unmask = lh7a404_vic1_unmask_irq,
}; };
static struct irqchip lh7a404_vic2_chip = { static struct irq_chip lh7a404_vic2_chip = {
.name = "VIC2",
.ack = lh7a404_vic2_mask_irq, /* Because level-triggered */ .ack = lh7a404_vic2_mask_irq, /* Because level-triggered */
.mask = lh7a404_vic2_mask_irq, .mask = lh7a404_vic2_mask_irq,
.unmask = lh7a404_vic2_unmask_irq, .unmask = lh7a404_vic2_unmask_irq,
}; };
static struct irqchip lh7a404_gpio_vic1_chip = { static struct irq_chip lh7a404_gpio_vic1_chip = {
.name = "GPIO-VIC1",
.ack = lh7a404_vic1_ack_gpio_irq, .ack = lh7a404_vic1_ack_gpio_irq,
.mask = lh7a404_vic1_mask_irq, .mask = lh7a404_vic1_mask_irq,
.unmask = lh7a404_vic1_unmask_irq, .unmask = lh7a404_vic1_unmask_irq,
}; };
static struct irqchip lh7a404_gpio_vic2_chip = { static struct irq_chip lh7a404_gpio_vic2_chip = {
.name = "GPIO-VIC2",
.ack = lh7a404_vic2_ack_gpio_irq, .ack = lh7a404_vic2_ack_gpio_irq,
.mask = lh7a404_vic2_mask_irq, .mask = lh7a404_vic2_mask_irq,
.unmask = lh7a404_vic2_unmask_irq, .unmask = lh7a404_vic2_unmask_irq,
......
...@@ -50,7 +50,8 @@ static void lh7a40x_unmask_cpld_irq (u32 irq) ...@@ -50,7 +50,8 @@ static void lh7a40x_unmask_cpld_irq (u32 irq)
} }
} }
static struct irqchip lh7a40x_cpld_chip = { static struct irq_chip lh7a40x_cpld_chip = {
.name = "CPLD",
.ack = lh7a40x_ack_cpld_irq, .ack = lh7a40x_ack_cpld_irq,
.mask = lh7a40x_mask_cpld_irq, .mask = lh7a40x_mask_cpld_irq,
.unmask = lh7a40x_unmask_cpld_irq, .unmask = lh7a40x_unmask_cpld_irq,
......
...@@ -106,14 +106,16 @@ void innovator_fpga_IRQ_demux(unsigned int irq, struct irqdesc *desc, ...@@ -106,14 +106,16 @@ void innovator_fpga_IRQ_demux(unsigned int irq, struct irqdesc *desc,
} }
} }
static struct irqchip omap_fpga_irq_ack = { static struct irq_chip omap_fpga_irq_ack = {
.name = "FPGA-ack",
.ack = fpga_mask_ack_irq, .ack = fpga_mask_ack_irq,
.mask = fpga_mask_irq, .mask = fpga_mask_irq,
.unmask = fpga_unmask_irq, .unmask = fpga_unmask_irq,
}; };
static struct irqchip omap_fpga_irq = { static struct irq_chip omap_fpga_irq = {
.name = "FPGA",
.ack = fpga_ack_irq, .ack = fpga_ack_irq,
.mask = fpga_mask_irq, .mask = fpga_mask_irq,
.unmask = fpga_unmask_irq, .unmask = fpga_unmask_irq,
......
...@@ -168,7 +168,8 @@ static struct omap_irq_bank omap1610_irq_banks[] = { ...@@ -168,7 +168,8 @@ static struct omap_irq_bank omap1610_irq_banks[] = {
}; };
#endif #endif
static struct irqchip omap_irq_chip = { static struct irq_chip omap_irq_chip = {
.name = "MPU",
.ack = omap_mask_ack_irq, .ack = omap_mask_ack_irq,
.mask = omap_mask_irq, .mask = omap_mask_irq,
.unmask = omap_unmask_irq, .unmask = omap_unmask_irq,
......
...@@ -94,7 +94,8 @@ static void omap_mask_ack_irq(unsigned int irq) ...@@ -94,7 +94,8 @@ static void omap_mask_ack_irq(unsigned int irq)
omap_ack_irq(irq); omap_ack_irq(irq);
} }
static struct irqchip omap_irq_chip = { static struct irq_chip omap_irq_chip = {
.name = "INTC",
.ack = omap_mask_ack_irq, .ack = omap_mask_ack_irq,
.mask = omap_mask_irq, .mask = omap_mask_irq,
.unmask = omap_unmask_irq, .unmask = omap_unmask_irq,
......
...@@ -39,7 +39,8 @@ static void pxa_unmask_low_irq(unsigned int irq) ...@@ -39,7 +39,8 @@ static void pxa_unmask_low_irq(unsigned int irq)
ICMR |= (1 << (irq + PXA_IRQ_SKIP)); ICMR |= (1 << (irq + PXA_IRQ_SKIP));
} }
static struct irqchip pxa_internal_chip_low = { static struct irq_chip pxa_internal_chip_low = {
.name = "SC",
.ack = pxa_mask_low_irq, .ack = pxa_mask_low_irq,
.mask = pxa_mask_low_irq, .mask = pxa_mask_low_irq,
.unmask = pxa_unmask_low_irq, .unmask = pxa_unmask_low_irq,
...@@ -61,7 +62,8 @@ static void pxa_unmask_high_irq(unsigned int irq) ...@@ -61,7 +62,8 @@ static void pxa_unmask_high_irq(unsigned int irq)
ICMR2 |= (1 << (irq - 32 + PXA_IRQ_SKIP)); ICMR2 |= (1 << (irq - 32 + PXA_IRQ_SKIP));
} }
static struct irqchip pxa_internal_chip_high = { static struct irq_chip pxa_internal_chip_high = {
.name = "SC-hi",
.ack = pxa_mask_high_irq, .ack = pxa_mask_high_irq,
.mask = pxa_mask_high_irq, .mask = pxa_mask_high_irq,
.unmask = pxa_unmask_high_irq, .unmask = pxa_unmask_high_irq,
...@@ -129,7 +131,8 @@ static void pxa_ack_low_gpio(unsigned int irq) ...@@ -129,7 +131,8 @@ static void pxa_ack_low_gpio(unsigned int irq)
GEDR0 = (1 << (irq - IRQ_GPIO0)); GEDR0 = (1 << (irq - IRQ_GPIO0));
} }
static struct irqchip pxa_low_gpio_chip = { static struct irq_chip pxa_low_gpio_chip = {
.name = "GPIO-l",
.ack = pxa_ack_low_gpio, .ack = pxa_ack_low_gpio,
.mask = pxa_mask_low_irq, .mask = pxa_mask_low_irq,
.unmask = pxa_unmask_low_irq, .unmask = pxa_unmask_low_irq,
...@@ -237,7 +240,8 @@ static void pxa_unmask_muxed_gpio(unsigned int irq) ...@@ -237,7 +240,8 @@ static void pxa_unmask_muxed_gpio(unsigned int irq)
GFER(gpio) = GPIO_IRQ_falling_edge[idx] & GPIO_IRQ_mask[idx]; GFER(gpio) = GPIO_IRQ_falling_edge[idx] & GPIO_IRQ_mask[idx];
} }
static struct irqchip pxa_muxed_gpio_chip = { static struct irq_chip pxa_muxed_gpio_chip = {
.name = "GPIO",
.ack = pxa_ack_muxed_gpio, .ack = pxa_ack_muxed_gpio,
.mask = pxa_mask_muxed_gpio, .mask = pxa_mask_muxed_gpio,
.unmask = pxa_unmask_muxed_gpio, .unmask = pxa_unmask_muxed_gpio,
......
...@@ -68,7 +68,8 @@ static void lpd270_unmask_irq(unsigned int irq) ...@@ -68,7 +68,8 @@ static void lpd270_unmask_irq(unsigned int irq)
__raw_writew(lpd270_irq_enabled, LPD270_INT_MASK); __raw_writew(lpd270_irq_enabled, LPD270_INT_MASK);
} }
static struct irqchip lpd270_irq_chip = { static struct irq_chip lpd270_irq_chip = {
.name = "CPLD",
.ack = lpd270_mask_irq, .ack = lpd270_mask_irq,
.mask = lpd270_mask_irq, .mask = lpd270_mask_irq,
.unmask = lpd270_unmask_irq, .unmask = lpd270_unmask_irq,
......
...@@ -78,7 +78,8 @@ static void lubbock_unmask_irq(unsigned int irq) ...@@ -78,7 +78,8 @@ static void lubbock_unmask_irq(unsigned int irq)
LUB_IRQ_MASK_EN = (lubbock_irq_enabled |= (1 << lubbock_irq)); LUB_IRQ_MASK_EN = (lubbock_irq_enabled |= (1 << lubbock_irq));
} }
static struct irqchip lubbock_irq_chip = { static struct irq_chip lubbock_irq_chip = {
.name = "FPGA",
.ack = lubbock_mask_irq, .ack = lubbock_mask_irq,
.mask = lubbock_mask_irq, .mask = lubbock_mask_irq,
.unmask = lubbock_unmask_irq, .unmask = lubbock_unmask_irq,
......
...@@ -64,7 +64,8 @@ static void mainstone_unmask_irq(unsigned int irq) ...@@ -64,7 +64,8 @@ static void mainstone_unmask_irq(unsigned int irq)
MST_INTMSKENA = (mainstone_irq_enabled |= (1 << mainstone_irq)); MST_INTMSKENA = (mainstone_irq_enabled |= (1 << mainstone_irq));
} }
static struct irqchip mainstone_irq_chip = { static struct irq_chip mainstone_irq_chip = {
.name = "FPGA",
.ack = mainstone_mask_irq, .ack = mainstone_mask_irq,
.mask = mainstone_mask_irq, .mask = mainstone_mask_irq,
.unmask = mainstone_unmask_irq, .unmask = mainstone_unmask_irq,
......
...@@ -95,7 +95,8 @@ static int sa1100_low_gpio_wake(unsigned int irq, unsigned int on) ...@@ -95,7 +95,8 @@ static int sa1100_low_gpio_wake(unsigned int irq, unsigned int on)
return 0; return 0;
} }
static struct irqchip sa1100_low_gpio_chip = { static struct irq_chip sa1100_low_gpio_chip = {
.name = "GPIO-l",
.ack = sa1100_low_gpio_ack, .ack = sa1100_low_gpio_ack,
.mask = sa1100_low_gpio_mask, .mask = sa1100_low_gpio_mask,
.unmask = sa1100_low_gpio_unmask, .unmask = sa1100_low_gpio_unmask,
...@@ -178,7 +179,8 @@ static int sa1100_high_gpio_wake(unsigned int irq, unsigned int on) ...@@ -178,7 +179,8 @@ static int sa1100_high_gpio_wake(unsigned int irq, unsigned int on)
return 0; return 0;
} }
static struct irqchip sa1100_high_gpio_chip = { static struct irq_chip sa1100_high_gpio_chip = {
.name = "GPIO-h",
.ack = sa1100_high_gpio_ack, .ack = sa1100_high_gpio_ack,
.mask = sa1100_high_gpio_mask, .mask = sa1100_high_gpio_mask,
.unmask = sa1100_high_gpio_unmask, .unmask = sa1100_high_gpio_unmask,
...@@ -215,7 +217,8 @@ static int sa1100_set_wake(unsigned int irq, unsigned int on) ...@@ -215,7 +217,8 @@ static int sa1100_set_wake(unsigned int irq, unsigned int on)
return -EINVAL; return -EINVAL;
} }
static struct irqchip sa1100_normal_chip = { static struct irq_chip sa1100_normal_chip = {
.name = "SC",
.ack = sa1100_mask_irq, .ack = sa1100_mask_irq,
.mask = sa1100_mask_irq, .mask = sa1100_mask_irq,
.unmask = sa1100_unmask_irq, .unmask = sa1100_unmask_irq,
......
...@@ -69,7 +69,8 @@ static irqreturn_t bogus_int(int irq, void *dev_id, struct pt_regs *regs) ...@@ -69,7 +69,8 @@ static irqreturn_t bogus_int(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction cascade; static struct irqaction cascade;
static struct irqchip fb_chip = { static struct irq_chip fb_chip = {
.name = "XT-PIC",
.ack = shark_ack_8259A_irq, .ack = shark_ack_8259A_irq,
.mask = shark_disable_8259A_irq, .mask = shark_disable_8259A_irq,
.unmask = shark_enable_8259A_irq, .unmask = shark_enable_8259A_irq,
......
...@@ -69,7 +69,8 @@ static void sic_unmask_irq(unsigned int irq) ...@@ -69,7 +69,8 @@ static void sic_unmask_irq(unsigned int irq)
writel(1 << irq, VA_SIC_BASE + SIC_IRQ_ENABLE_SET); writel(1 << irq, VA_SIC_BASE + SIC_IRQ_ENABLE_SET);
} }
static struct irqchip sic_chip = { static struct irq_chip sic_chip = {
.name = "SIC",
.ack = sic_mask_irq, .ack = sic_mask_irq,
.mask = sic_mask_irq, .mask = sic_mask_irq,
.unmask = sic_unmask_irq, .unmask = sic_unmask_irq,
......
...@@ -944,7 +944,8 @@ static void mpuio_unmask_irq(unsigned int irq) ...@@ -944,7 +944,8 @@ static void mpuio_unmask_irq(unsigned int irq)
_set_gpio_irqenable(bank, gpio, 1); _set_gpio_irqenable(bank, gpio, 1);
} }
static struct irqchip gpio_irq_chip = { static struct irq_chip gpio_irq_chip = {
.name = "GPIO",
.ack = gpio_ack_irq, .ack = gpio_ack_irq,
.mask = gpio_mask_irq, .mask = gpio_mask_irq,
.unmask = gpio_unmask_irq, .unmask = gpio_unmask_irq,
...@@ -952,7 +953,8 @@ static struct irqchip gpio_irq_chip = { ...@@ -952,7 +953,8 @@ static struct irqchip gpio_irq_chip = {
.set_wake = gpio_wake_enable, .set_wake = gpio_wake_enable,
}; };
static struct irqchip mpuio_irq_chip = { static struct irq_chip mpuio_irq_chip = {
.name = "MPUIO",
.ack = mpuio_ack_irq, .ack = mpuio_ack_irq,
.mask = mpuio_mask_irq, .mask = mpuio_mask_irq,
.unmask = mpuio_unmask_irq .unmask = mpuio_unmask_irq
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment