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

Commit a4b48a49 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by David Howells
Browse files

frv: Convert mb93493 irq_chip to new functions 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 9148d88b

arch/frv/kernel/irq-mb93493.c

+11 −11
Original line number Diff line number Diff line
@@ -45,46 +45,46 @@ 
 * daughter board PIC operations

 * - there is no way to ACK interrupts in the MB93493 chip

 */

static void frv_mb93493_mask(unsigned int irq)

static void frv_mb93493_mask(struct irq_data *d)

{

	uint32_t iqsr;

	volatile void *piqsr;



	if (IRQ_ROUTING & (1 << (irq - IRQ_BASE_MB93493)))

	if (IRQ_ROUTING & (1 << (d->irq - IRQ_BASE_MB93493)))

		piqsr = __addr_MB93493_IQSR(1);

	else

		piqsr = __addr_MB93493_IQSR(0);



	iqsr = readl(piqsr);

	iqsr &= ~(1 << (irq - IRQ_BASE_MB93493 + 16));

	iqsr &= ~(1 << (d->irq - IRQ_BASE_MB93493 + 16));

	writel(iqsr, piqsr);

}



static void frv_mb93493_ack(unsigned int irq)

static void frv_mb93493_ack(struct irq_data *d)

{

}



static void frv_mb93493_unmask(unsigned int irq)

static void frv_mb93493_unmask(struct irq_data *d)

{

	uint32_t iqsr;

	volatile void *piqsr;



	if (IRQ_ROUTING & (1 << (irq - IRQ_BASE_MB93493)))

	if (IRQ_ROUTING & (1 << (d->irq - IRQ_BASE_MB93493)))

		piqsr = __addr_MB93493_IQSR(1);

	else

		piqsr = __addr_MB93493_IQSR(0);



	iqsr = readl(piqsr);

	iqsr |= 1 << (irq - IRQ_BASE_MB93493 + 16);

	iqsr |= 1 << (d->irq - IRQ_BASE_MB93493 + 16);

	writel(iqsr, piqsr);

}



static struct irq_chip frv_mb93493_pic = {

	.name		= "mb93093",

	.ack		= frv_mb93493_ack,

	.mask		= frv_mb93493_mask,

	.mask_ack	= frv_mb93493_mask,

	.unmask		= frv_mb93493_unmask,

	.irq_ack	= frv_mb93493_ack,

	.irq_mask	= frv_mb93493_mask,

	.irq_mask_ack	= frv_mb93493_mask,

	.irq_unmask	= frv_mb93493_unmask,

};



/*