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

Commit f80c353c authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Greg Ungerer
Browse files

m68knommu: Convert coldfire intc-simr irq_chip to new 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 0bc0f3aa

arch/m68knommu/platform/coldfire/intc-simr.c

+12 −6
Original line number Original line Diff line number Diff line
@@ -20,8 +20,10 @@ 
#include <asm/mcfsim.h>

#include <asm/mcfsim.h>

#include <asm/traps.h>

#include <asm/traps.h>





static void intc_irq_mask(unsigned int irq)

static void intc_irq_mask(struct irq_data *d)

{

{

	unsigned int irq = d->irq;



	if (irq >= MCFINT_VECBASE) {

	if (irq >= MCFINT_VECBASE) {

		if (irq < MCFINT_VECBASE + 64)

		if (irq < MCFINT_VECBASE + 64)

			__raw_writeb(irq - MCFINT_VECBASE, MCFINTC0_SIMR);

			__raw_writeb(irq - MCFINT_VECBASE, MCFINTC0_SIMR);
@@ -30,8 +32,10 @@ static void intc_irq_mask(unsigned int irq) 
	}

	}

}

}





static void intc_irq_unmask(unsigned int irq)

static void intc_irq_unmask(struct irq_data *d)

{

{

	unsigned int irq = d->irq;



	if (irq >= MCFINT_VECBASE) {

	if (irq >= MCFINT_VECBASE) {

		if (irq < MCFINT_VECBASE + 64)

		if (irq < MCFINT_VECBASE + 64)

			__raw_writeb(irq - MCFINT_VECBASE, MCFINTC0_CIMR);

			__raw_writeb(irq - MCFINT_VECBASE, MCFINTC0_CIMR);
@@ -40,8 +44,10 @@ static void intc_irq_unmask(unsigned int irq) 
	}

	}

}

}





static int intc_irq_set_type(unsigned int irq, unsigned int type)

static int intc_irq_set_type(struct irq_data *d, unsigned int type)

{

{

	unsigned int irq = d->irq;



	if (irq >= MCFINT_VECBASE) {

	if (irq >= MCFINT_VECBASE) {

		if (irq < MCFINT_VECBASE + 64)

		if (irq < MCFINT_VECBASE + 64)

			__raw_writeb(5, MCFINTC0_ICR0 + irq - MCFINT_VECBASE);

			__raw_writeb(5, MCFINTC0_ICR0 + irq - MCFINT_VECBASE);
@@ -53,9 +59,9 @@ static int intc_irq_set_type(unsigned int irq, unsigned int type) 




static struct irq_chip intc_irq_chip = {

static struct irq_chip intc_irq_chip = {

	.name		= "CF-INTC",

	.name		= "CF-INTC",

	.mask		= intc_irq_mask,

	.irq_mask	= intc_irq_mask,

	.unmask		= intc_irq_unmask,

	.irq_unmask	= intc_irq_unmask,

	.set_type	= intc_irq_set_type,

	.irq_set_type	= intc_irq_set_type,

};

};





void __init init_IRQ(void)

void __init init_IRQ(void)