GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 23:32:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

powerpc: sysdev/mpc8xx_pic irq_data conversion.

Browse source 
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Lennert Buytenhek 2011-03-07 14:00:00 +00:00 • committed by Benjamin Herrenschmidt
parent 687228ad40
commit febd401787
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
arch/powerpc/sysdev/mpc8xx_pic.c
View file

@ -25,10 +25,10 @@ static sysconf8xx_t __iomem *siu_reg;
int cpm_get_irq(struct pt_regs *regs); int cpm_get_irq(struct pt_regs *regs);
static void mpc8xx_unmask_irq(unsigned int virq) static void mpc8xx_unmask_irq(struct irq_data *d)
{ {
int bit, word; int bit, word;
unsigned int irq_nr = (unsigned int)irq_map[virq].hwirq; unsigned int irq_nr = (unsigned int)irq_map[d->irq].hwirq;
bit = irq_nr & 0x1f; bit = irq_nr & 0x1f;
word = irq_nr >> 5; word = irq_nr >> 5;
@ -37,10 +37,10 @@ static void mpc8xx_unmask_irq(unsigned int virq)
out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]); out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]);
} }
static void mpc8xx_mask_irq(unsigned int virq) static void mpc8xx_mask_irq(struct irq_data *d)
{ {
int bit, word; int bit, word;
unsigned int irq_nr = (unsigned int)irq_map[virq].hwirq; unsigned int irq_nr = (unsigned int)irq_map[d->irq].hwirq;
bit = irq_nr & 0x1f; bit = irq_nr & 0x1f;
word = irq_nr >> 5; word = irq_nr >> 5;
@ -49,19 +49,19 @@ static void mpc8xx_mask_irq(unsigned int virq)
out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]); out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]);
} }
static void mpc8xx_ack(unsigned int virq) static void mpc8xx_ack(struct irq_data *d)
{ {
int bit; int bit;
unsigned int irq_nr = (unsigned int)irq_map[virq].hwirq; unsigned int irq_nr = (unsigned int)irq_map[d->irq].hwirq;
bit = irq_nr & 0x1f; bit = irq_nr & 0x1f;
out_be32(&siu_reg->sc_sipend, 1 << (31-bit)); out_be32(&siu_reg->sc_sipend, 1 << (31-bit));
} }
static void mpc8xx_end_irq(unsigned int virq) static void mpc8xx_end_irq(struct irq_data *d)
{ {
int bit, word; int bit, word;
unsigned int irq_nr = (unsigned int)irq_map[virq].hwirq; unsigned int irq_nr = (unsigned int)irq_map[d->irq].hwirq;
bit = irq_nr & 0x1f; bit = irq_nr & 0x1f;
word = irq_nr >> 5; word = irq_nr >> 5;
@ -70,9 +70,9 @@ static void mpc8xx_end_irq(unsigned int virq)
out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]); out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]);
} }
static int mpc8xx_set_irq_type(unsigned int virq, unsigned int flow_type) static int mpc8xx_set_irq_type(struct irq_data *d, unsigned int flow_type)
{ {
struct irq_desc *desc = irq_to_desc(virq); struct irq_desc *desc = irq_to_desc(d->irq);
desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL); desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
desc->status |= flow_type & IRQ_TYPE_SENSE_MASK; desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
@ -80,7 +80,7 @@ static int mpc8xx_set_irq_type(unsigned int virq, unsigned int flow_type)
desc->status |= IRQ_LEVEL; desc->status |= IRQ_LEVEL;
if (flow_type & IRQ_TYPE_EDGE_FALLING) { if (flow_type & IRQ_TYPE_EDGE_FALLING) {
irq_hw_number_t hw = (unsigned int)irq_map[virq].hwirq; irq_hw_number_t hw = (unsigned int)irq_map[d->irq].hwirq;
unsigned int siel = in_be32(&siu_reg->sc_siel); unsigned int siel = in_be32(&siu_reg->sc_siel);
/* only external IRQ senses are programmable */ /* only external IRQ senses are programmable */
@ -95,11 +95,11 @@ static int mpc8xx_set_irq_type(unsigned int virq, unsigned int flow_type)
static struct irq_chip mpc8xx_pic = { static struct irq_chip mpc8xx_pic = {
.name = "MPC8XX SIU", .name = "MPC8XX SIU",
.unmask = mpc8xx_unmask_irq, .irq_unmask = mpc8xx_unmask_irq,
.mask = mpc8xx_mask_irq, .irq_mask = mpc8xx_mask_irq,
.ack = mpc8xx_ack, .irq_ack = mpc8xx_ack,
.eoi = mpc8xx_end_irq, .irq_eoi = mpc8xx_end_irq,
.set_type = mpc8xx_set_irq_type, .irq_set_type = mpc8xx_set_irq_type,
}; };
unsigned int mpc8xx_get_irq(void) unsigned int mpc8xx_get_irq(void)