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

Commit 63b549b6 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

m32r: Convert m32700ut pld irq chip 



Convert the irq chips to the new functions and use proper flow
handlers. handle_level_irq is appropriate.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Paul Mundt <lethal@linux-sh.org>
parent 364a9ba0

arch/m32r/platforms/m32700ut/setup.c

+20 −28
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ static void disable_m32700ut_pld_irq(unsigned int irq) 
	unsigned int pldirq;



	pldirq = irq2pldirq(irq);

//	disable_m32700ut_irq(M32R_IRQ_INT1);

	port = pldirq2port(pldirq);

	data = pld_icu_data[pldirq].icucr|PLD_ICUCR_ILEVEL7;

	outw(data, port);
@@ -102,37 +101,28 @@ static void enable_m32700ut_pld_irq(unsigned int irq) 
	unsigned int pldirq;



	pldirq = irq2pldirq(irq);

//	enable_m32700ut_irq(M32R_IRQ_INT1);

	port = pldirq2port(pldirq);

	data = pld_icu_data[pldirq].icucr|PLD_ICUCR_IEN|PLD_ICUCR_ILEVEL6;

	outw(data, port);

}



static void mask_and_ack_m32700ut_pld(unsigned int irq)

static void mask_m32700ut_pld(struct irq_data *data)

{

	disable_m32700ut_pld_irq(irq);

//	mask_and_ack_m32700ut(M32R_IRQ_INT1);

	disable_m32700ut_pld_irq(data->irq);

}



static void end_m32700ut_pld_irq(unsigned int irq)

static void unmask_m32700ut_pld(struct irq_data *data)

{

	enable_m32700ut_pld_irq(irq);

	enable_m32700ut_pld_irq(data->irq);

	enable_m32700ut_irq(M32R_IRQ_INT1);

}



static unsigned int startup_m32700ut_pld_irq(unsigned int irq)

{

	enable_m32700ut_pld_irq(irq);

	return (0);

}



static void shutdown_m32700ut_pld_irq(unsigned int irq)

static void shutdown_m32700ut_pld_irq(struct irq_data *data)

{

	unsigned long port;

	unsigned int pldirq;



	pldirq = irq2pldirq(irq);

//	shutdown_m32700ut_irq(M32R_IRQ_INT1);

	pldirq = irq2pldirq(data->irq);

	port = pldirq2port(pldirq);

	outw(PLD_ICUCR_ILEVEL7, port);

}
@@ -140,12 +130,9 @@ static void shutdown_m32700ut_pld_irq(unsigned int irq) 
static struct irq_chip m32700ut_pld_irq_type =

{

	.name		= "M32700UT-PLD-IRQ",

	.startup = startup_m32700ut_pld_irq,

	.shutdown = shutdown_m32700ut_pld_irq,

	.enable = enable_m32700ut_pld_irq,

	.disable = disable_m32700ut_pld_irq,

	.ack = mask_and_ack_m32700ut_pld,

	.end = end_m32700ut_pld_irq

	.irq_shutdown	= shutdown_m32700ut_pld_irq,

	.irq_mask	= mask_m32700ut_pld,

	.irq_unmask	= unmask_m32700ut_pld,

};



/*
@@ -333,28 +320,33 @@ void __init init_IRQ(void) 


#ifdef CONFIG_SERIAL_M32R_PLDSIO

	/* INT#1: SIO0 Receive on PLD */

	set_irq_chip(PLD_IRQ_SIO0_RCV, &m32700ut_pld_irq_type);

	set_irq_chip_and_handler(PLD_IRQ_SIO0_RCV, &m32700ut_pld_irq_type,

				 handle_level_irq);

	pld_icu_data[irq2pldirq(PLD_IRQ_SIO0_RCV)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD03;

	disable_m32700ut_pld_irq(PLD_IRQ_SIO0_RCV);



	/* INT#1: SIO0 Send on PLD */

	set_irq_chip(PLD_IRQ_SIO0_SND, &m32700ut_pld_irq_type);

	set_irq_chip_and_handler(PLD_IRQ_SIO0_SND, &m32700ut_pld_irq_type,

				 handle_level_irq);

	pld_icu_data[irq2pldirq(PLD_IRQ_SIO0_SND)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD03;

	disable_m32700ut_pld_irq(PLD_IRQ_SIO0_SND);

#endif  /* CONFIG_SERIAL_M32R_PLDSIO */



	/* INT#1: CFC IREQ on PLD */

	set_irq_chip(PLD_IRQ_CFIREQ, &m32700ut_pld_irq_type);

	set_irq_chip_and_handler(PLD_IRQ_CFIREQ, &m32700ut_pld_irq_type,

				 handle_level_irq);

	pld_icu_data[irq2pldirq(PLD_IRQ_CFIREQ)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD01;	/* 'L' level sense */

	disable_m32700ut_pld_irq(PLD_IRQ_CFIREQ);



	/* INT#1: CFC Insert on PLD */

	set_irq_chip(PLD_IRQ_CFC_INSERT, &m32700ut_pld_irq_type);

	set_irq_chip_and_handler(PLD_IRQ_CFC_INSERT, &m32700ut_pld_irq_type,

				 handle_level_irq);

	pld_icu_data[irq2pldirq(PLD_IRQ_CFC_INSERT)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD00;	/* 'L' edge sense */

	disable_m32700ut_pld_irq(PLD_IRQ_CFC_INSERT);



	/* INT#1: CFC Eject on PLD */

	set_irq_chip(PLD_IRQ_CFC_EJECT, &m32700ut_pld_irq_type);

	set_irq_chip_and_handler(PLD_IRQ_CFC_EJECT, &m32700ut_pld_irq_type,

				 handle_level_irq);

	pld_icu_data[irq2pldirq(PLD_IRQ_CFC_EJECT)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD02;	/* 'H' edge sense */

	disable_m32700ut_pld_irq(PLD_IRQ_CFC_EJECT);