Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf1d4d50 authored by Lennert Buytenhek's avatar Lennert Buytenhek
Browse files

ARM: bcmring: irq_data conversion. 



Signed-off-by: default avatarLennert Buytenhek <buytenh@secretlab.ca>
Acked-by: default avatarScott Branden <sbranden@broadcom.com>
parent da0f9403

arch/arm/mach-bcmring/irq.c

+21 −21
Original line number Original line Diff line number Diff line
@@ -30,61 +30,61 @@ 
#include <mach/csp/intcHw_reg.h>

#include <mach/csp/intcHw_reg.h>

#include <mach/csp/mm_io.h>

#include <mach/csp/mm_io.h>





static void bcmring_mask_irq0(unsigned int irq)

static void bcmring_mask_irq0(struct irq_data *d)

{

{

	writel(1 << (irq - IRQ_INTC0_START),

	writel(1 << (d->irq - IRQ_INTC0_START),

	       MM_IO_BASE_INTC0 + INTCHW_INTENCLEAR);

	       MM_IO_BASE_INTC0 + INTCHW_INTENCLEAR);

}

}





static void bcmring_unmask_irq0(unsigned int irq)

static void bcmring_unmask_irq0(struct irq_data *d)

{

{

	writel(1 << (irq - IRQ_INTC0_START),

	writel(1 << (d->irq - IRQ_INTC0_START),

	       MM_IO_BASE_INTC0 + INTCHW_INTENABLE);

	       MM_IO_BASE_INTC0 + INTCHW_INTENABLE);

}

}





static void bcmring_mask_irq1(unsigned int irq)

static void bcmring_mask_irq1(struct irq_data *d)

{

{

	writel(1 << (irq - IRQ_INTC1_START),

	writel(1 << (d->irq - IRQ_INTC1_START),

	       MM_IO_BASE_INTC1 + INTCHW_INTENCLEAR);

	       MM_IO_BASE_INTC1 + INTCHW_INTENCLEAR);

}

}





static void bcmring_unmask_irq1(unsigned int irq)

static void bcmring_unmask_irq1(struct irq_data *d)

{

{

	writel(1 << (irq - IRQ_INTC1_START),

	writel(1 << (d->irq - IRQ_INTC1_START),

	       MM_IO_BASE_INTC1 + INTCHW_INTENABLE);

	       MM_IO_BASE_INTC1 + INTCHW_INTENABLE);

}

}





static void bcmring_mask_irq2(unsigned int irq)

static void bcmring_mask_irq2(struct irq_data *d)

{

{

	writel(1 << (irq - IRQ_SINTC_START),

	writel(1 << (d->irq - IRQ_SINTC_START),

	       MM_IO_BASE_SINTC + INTCHW_INTENCLEAR);

	       MM_IO_BASE_SINTC + INTCHW_INTENCLEAR);

}

}





static void bcmring_unmask_irq2(unsigned int irq)

static void bcmring_unmask_irq2(struct irq_data *d)

{

{

	writel(1 << (irq - IRQ_SINTC_START),

	writel(1 << (d->irq - IRQ_SINTC_START),

	       MM_IO_BASE_SINTC + INTCHW_INTENABLE);

	       MM_IO_BASE_SINTC + INTCHW_INTENABLE);

}

}





static struct irq_chip bcmring_irq0_chip = {

static struct irq_chip bcmring_irq0_chip = {

	.name = "ARM-INTC0",

	.name = "ARM-INTC0",

	.ack = bcmring_mask_irq0,

	.irq_ack = bcmring_mask_irq0,

	.mask = bcmring_mask_irq0,	/* mask a specific interrupt, blocking its delivery. */

	.irq_mask = bcmring_mask_irq0,	/* mask a specific interrupt, blocking its delivery. */

	.unmask = bcmring_unmask_irq0,	/* unmaks an interrupt */

	.irq_unmask = bcmring_unmask_irq0,	/* unmaks an interrupt */

};

};





static struct irq_chip bcmring_irq1_chip = {

static struct irq_chip bcmring_irq1_chip = {

	.name = "ARM-INTC1",

	.name = "ARM-INTC1",

	.ack = bcmring_mask_irq1,

	.irq_ack = bcmring_mask_irq1,

	.mask = bcmring_mask_irq1,

	.irq_mask = bcmring_mask_irq1,

	.unmask = bcmring_unmask_irq1,

	.irq_unmask = bcmring_unmask_irq1,

};

};





static struct irq_chip bcmring_irq2_chip = {

static struct irq_chip bcmring_irq2_chip = {

	.name = "ARM-SINTC",

	.name = "ARM-SINTC",

	.ack = bcmring_mask_irq2,

	.irq_ack = bcmring_mask_irq2,

	.mask = bcmring_mask_irq2,

	.irq_mask = bcmring_mask_irq2,

	.unmask = bcmring_unmask_irq2,

	.irq_unmask = bcmring_unmask_irq2,

};

};





static void vic_init(void __iomem *base, struct irq_chip *chip,

static void vic_init(void __iomem *base, struct irq_chip *chip,