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

Commit 680244df authored by Lennert Buytenhek's avatar Lennert Buytenhek
Browse files

ARM: LoCoMo: irq_data conversion. 



Signed-off-by: default avatarLennert Buytenhek <buytenh@secretlab.ca>
parent 8cdd4572

arch/arm/common/locomo.c

+12 −12
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static void locomo_handler(unsigned int irq, struct irq_desc *desc) 
	int req, i;



	/* Acknowledge the parent IRQ */

	desc->chip->ack(irq);

	desc->irq_data.chip->irq_ack(&desc->irq_data);



	/* check why this interrupt was generated */

	req = locomo_readl(lchip->base + LOCOMO_ICR) & 0x0f00;
@@ -161,33 +161,33 @@ static void locomo_handler(unsigned int irq, struct irq_desc *desc) 
	}

}



static void locomo_ack_irq(unsigned int irq)

static void locomo_ack_irq(struct irq_data *d)

{

}



static void locomo_mask_irq(unsigned int irq)

static void locomo_mask_irq(struct irq_data *d)

{

	struct locomo *lchip = get_irq_chip_data(irq);

	struct locomo *lchip = irq_data_get_irq_chip_data(d);

	unsigned int r;

	r = locomo_readl(lchip->base + LOCOMO_ICR);

	r &= ~(0x0010 << (irq - lchip->irq_base));

	r &= ~(0x0010 << (d->irq - lchip->irq_base));

	locomo_writel(r, lchip->base + LOCOMO_ICR);

}



static void locomo_unmask_irq(unsigned int irq)

static void locomo_unmask_irq(struct irq_data *d)

{

	struct locomo *lchip = get_irq_chip_data(irq);

	struct locomo *lchip = irq_data_get_irq_chip_data(d);

	unsigned int r;

	r = locomo_readl(lchip->base + LOCOMO_ICR);

	r |= (0x0010 << (irq - lchip->irq_base));

	r |= (0x0010 << (d->irq - lchip->irq_base));

	locomo_writel(r, lchip->base + LOCOMO_ICR);

}



static struct irq_chip locomo_chip = {

	.name		= "LOCOMO",

	.ack	= locomo_ack_irq,

	.mask	= locomo_mask_irq,

	.unmask	= locomo_unmask_irq,

	.irq_ack	= locomo_ack_irq,

	.irq_mask	= locomo_mask_irq,

	.irq_unmask	= locomo_unmask_irq,

};



static void locomo_setup_irq(struct locomo *lchip)