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

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

ARM: integrator: irq_data conversion. 



Signed-off-by: default avatarLennert Buytenhek <buytenh@secretlab.ca>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c971ab0d

arch/arm/mach-integrator/integrator_ap.c

+8 −8
Original line number Diff line number Diff line
@@ -156,21 +156,21 @@ static void __init ap_map_io(void) 


#define INTEGRATOR_SC_VALID_INT	0x003fffff



static void sc_mask_irq(unsigned int irq)

static void sc_mask_irq(struct irq_data *d)

{

	writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_CLEAR);

	writel(1 << d->irq, VA_IC_BASE + IRQ_ENABLE_CLEAR);

}



static void sc_unmask_irq(unsigned int irq)

static void sc_unmask_irq(struct irq_data *d)

{

	writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_SET);

	writel(1 << d->irq, VA_IC_BASE + IRQ_ENABLE_SET);

}



static struct irq_chip sc_chip = {

	.name		= "SC",

	.ack	= sc_mask_irq,

	.mask	= sc_mask_irq,

	.unmask = sc_unmask_irq,

	.irq_ack	= sc_mask_irq,

	.irq_mask	= sc_mask_irq,

	.irq_unmask	= sc_unmask_irq,

};



static void __init ap_init_irq(void)

arch/arm/mach-integrator/integrator_cp.c

+24 −24
Original line number Diff line number Diff line
@@ -146,61 +146,61 @@ static void __init intcp_map_io(void) 
#define sic_writel	__raw_writel

#define sic_readl	__raw_readl



static void cic_mask_irq(unsigned int irq)

static void cic_mask_irq(struct irq_data *d)

{

	irq -= IRQ_CIC_START;

	unsigned int irq = d->irq - IRQ_CIC_START;

	cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_CLEAR);

}



static void cic_unmask_irq(unsigned int irq)

static void cic_unmask_irq(struct irq_data *d)

{

	irq -= IRQ_CIC_START;

	unsigned int irq = d->irq - IRQ_CIC_START;

	cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_SET);

}



static struct irq_chip cic_chip = {

	.name		= "CIC",

	.ack	= cic_mask_irq,

	.mask	= cic_mask_irq,

	.unmask	= cic_unmask_irq,

	.irq_ack	= cic_mask_irq,

	.irq_mask	= cic_mask_irq,

	.irq_unmask	= cic_unmask_irq,

};



static void pic_mask_irq(unsigned int irq)

static void pic_mask_irq(struct irq_data *d)

{

	irq -= IRQ_PIC_START;

	unsigned int irq = d->irq - IRQ_PIC_START;

	pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_CLEAR);

}



static void pic_unmask_irq(unsigned int irq)

static void pic_unmask_irq(struct irq_data *d)

{

	irq -= IRQ_PIC_START;

	unsigned int irq = d->irq - IRQ_PIC_START;

	pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_SET);

}



static struct irq_chip pic_chip = {

	.name		= "PIC",

	.ack	= pic_mask_irq,

	.mask	= pic_mask_irq,

	.unmask = pic_unmask_irq,

	.irq_ack	= pic_mask_irq,

	.irq_mask	= pic_mask_irq,

	.irq_unmask	= pic_unmask_irq,

};



static void sic_mask_irq(unsigned int irq)

static void sic_mask_irq(struct irq_data *d)

{

	irq -= IRQ_SIC_START;

	unsigned int irq = d->irq - IRQ_SIC_START;

	sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_CLEAR);

}



static void sic_unmask_irq(unsigned int irq)

static void sic_unmask_irq(struct irq_data *d)

{

	irq -= IRQ_SIC_START;

	unsigned int irq = d->irq - IRQ_SIC_START;

	sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_SET);

}



static struct irq_chip sic_chip = {

	.name		= "SIC",

	.ack	= sic_mask_irq,

	.mask	= sic_mask_irq,

	.unmask	= sic_unmask_irq,

	.irq_ack	= sic_mask_irq,

	.irq_mask	= sic_mask_irq,

	.irq_unmask	= sic_unmask_irq,

};



static void