Commit 15ff2c67 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: mach-se: irq_data conversion. 



Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent e28abafb

arch/sh/boards/mach-se/7206/irq.c

+11 −9
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ 
#define INTC_IPR01 0xfffe0818

#define INTC_ICR1  0xfffe0802



static void disable_se7206_irq(unsigned int irq)

static void disable_se7206_irq(struct irq_data *data)

{

	unsigned int irq = data->irq;

	unsigned short val;

	unsigned short mask = 0xffff ^ (0x0f << 4 * (3 - (IRQ0_IRQ - irq)));

	unsigned short msk0,msk1;
@@ -55,8 +56,9 @@ static void disable_se7206_irq(unsigned int irq) 
	__raw_writew(msk1, INTMSK1);

}



static void enable_se7206_irq(unsigned int irq)

static void enable_se7206_irq(struct irq_data *data)

{

	unsigned int irq = data->irq;

	unsigned short val;

	unsigned short value = (0x0001 << 4 * (3 - (IRQ0_IRQ - irq)));

	unsigned short msk0,msk1;
@@ -86,13 +88,14 @@ static void enable_se7206_irq(unsigned int irq) 
	__raw_writew(msk1, INTMSK1);

}



static void eoi_se7206_irq(unsigned int irq)

static void eoi_se7206_irq(struct irq_data *data)

{

	unsigned short sts0,sts1;

	unsigned int irq = data->irq;

	struct irq_desc *desc = irq_to_desc(irq);



	if (!(desc->status & (IRQ_DISABLED|IRQ_INPROGRESS)))

		enable_se7206_irq(irq);

		enable_se7206_irq(data);

	/* FPGA isr clear */

	sts0 = __raw_readw(INTSTS0);

	sts1 = __raw_readw(INTSTS1);
@@ -115,10 +118,9 @@ static void eoi_se7206_irq(unsigned int irq) 


static struct irq_chip se7206_irq_chip __read_mostly = {

	.name		= "SE7206-FPGA",

	.mask		= disable_se7206_irq,

	.unmask		= enable_se7206_irq,

	.mask_ack	= disable_se7206_irq,

	.eoi		= eoi_se7206_irq,

	.irq_mask	= disable_se7206_irq,

	.irq_unmask	= enable_se7206_irq,

	.irq_eoi	= eoi_se7206_irq,

};



static void make_se7206_irq(unsigned int irq)
@@ -126,7 +128,7 @@ static void make_se7206_irq(unsigned int irq) 
	disable_irq_nosync(irq);

	set_irq_chip_and_handler_name(irq, &se7206_irq_chip,

				      handle_level_irq, "level");

	disable_se7206_irq(irq);

	disable_se7206_irq(irq_get_irq_data(irq));

}



/*

arch/sh/boards/mach-se/7343/irq.c

+7 −8
Original line number Diff line number Diff line
@@ -18,23 +18,22 @@ 


unsigned int se7343_fpga_irq[SE7343_FPGA_IRQ_NR] = { 0, };



static void disable_se7343_irq(unsigned int irq)

static void disable_se7343_irq(struct irq_data *data)

{

	unsigned int bit = (unsigned int)get_irq_chip_data(irq);

	unsigned int bit = (unsigned int)irq_data_get_irq_chip_data(data);

	__raw_writew(__raw_readw(PA_CPLD_IMSK) | 1 << bit, PA_CPLD_IMSK);

}



static void enable_se7343_irq(unsigned int irq)

static void enable_se7343_irq(struct irq_data *data)

{

	unsigned int bit = (unsigned int)get_irq_chip_data(irq);

	unsigned int bit = (unsigned int)irq_data_get_irq_chip_data(data);

	__raw_writew(__raw_readw(PA_CPLD_IMSK) & ~(1 << bit), PA_CPLD_IMSK);

}



static struct irq_chip se7343_irq_chip __read_mostly = {

	.name		= "SE7343-FPGA",

	.mask           = disable_se7343_irq,

	.unmask         = enable_se7343_irq,

	.mask_ack       = disable_se7343_irq,

	.irq_mask	= disable_se7343_irq,

	.irq_unmask	= enable_se7343_irq,

};



static void se7343_irq_demux(unsigned int irq, struct irq_desc *desc)

arch/sh/boards/mach-se/7722/irq.c

+7 −8
Original line number Diff line number Diff line
@@ -18,23 +18,22 @@ 


unsigned int se7722_fpga_irq[SE7722_FPGA_IRQ_NR] = { 0, };



static void disable_se7722_irq(unsigned int irq)

static void disable_se7722_irq(struct irq_data *data)

{

	unsigned int bit = (unsigned int)get_irq_chip_data(irq);

	unsigned int bit = (unsigned int)irq_data_get_irq_chip_data(data);

	__raw_writew(__raw_readw(IRQ01_MASK) | 1 << bit, IRQ01_MASK);

}



static void enable_se7722_irq(unsigned int irq)

static void enable_se7722_irq(struct irq_data *data)

{

	unsigned int bit = (unsigned int)get_irq_chip_data(irq);

	unsigned int bit = (unsigned int)irq_data_get_irq_chip_data(data);

	__raw_writew(__raw_readw(IRQ01_MASK) & ~(1 << bit), IRQ01_MASK);

}



static struct irq_chip se7722_irq_chip __read_mostly = {

	.name		= "SE7722-FPGA",

	.mask           = disable_se7722_irq,

	.unmask         = enable_se7722_irq,

	.mask_ack       = disable_se7722_irq,

	.irq_mask	= disable_se7722_irq,

	.irq_unmask	= enable_se7722_irq,

};



static void se7722_irq_demux(unsigned int irq, struct irq_desc *desc)

arch/sh/boards/mach-se/7724/irq.c

+7 −6
Original line number Diff line number Diff line
@@ -68,15 +68,17 @@ static struct fpga_irq get_fpga_irq(unsigned int irq) 
	return set;

}



static void disable_se7724_irq(unsigned int irq)

static void disable_se7724_irq(struct irq_data *data)

{

	unsigned int irq = data->irq;

	struct fpga_irq set = get_fpga_irq(fpga2irq(irq));

	unsigned int bit = irq - set.base;

	__raw_writew(__raw_readw(set.mraddr) | 0x0001 << bit, set.mraddr);

}



static void enable_se7724_irq(unsigned int irq)

static void enable_se7724_irq(struct irq_data *data)

{

	unsigned int irq = data->irq;

	struct fpga_irq set = get_fpga_irq(fpga2irq(irq));

	unsigned int bit = irq - set.base;

	__raw_writew(__raw_readw(set.mraddr) & ~(0x0001 << bit), set.mraddr);
@@ -84,9 +86,8 @@ static void enable_se7724_irq(unsigned int irq) 


static struct irq_chip se7724_irq_chip __read_mostly = {

	.name		= "SE7724-FPGA",

	.mask           = disable_se7724_irq,

	.unmask         = enable_se7724_irq,

	.mask_ack       = disable_se7724_irq,

	.irq_mask	= disable_se7724_irq,

	.irq_unmask	= enable_se7724_irq,

};



static void se7724_irq_demux(unsigned int irq, struct irq_desc *desc)