Commit 5f010384 authored by Paul Mundt's avatar Paul Mundt

sh: mach-systemh: irq_data conversion.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 949bf166
...@@ -23,54 +23,39 @@ ...@@ -23,54 +23,39 @@
static unsigned long *systemh_irq_mask_register = (unsigned long *)0xB3F10004; static unsigned long *systemh_irq_mask_register = (unsigned long *)0xB3F10004;
static unsigned long *systemh_irq_request_register = (unsigned long *)0xB3F10000; static unsigned long *systemh_irq_request_register = (unsigned long *)0xB3F10000;
/* forward declaration */ static void disable_systemh_irq(struct irq_data *data)
static void enable_systemh_irq(unsigned int irq);
static void disable_systemh_irq(unsigned int irq);
static void mask_and_ack_systemh(unsigned int);
static struct irq_chip systemh_irq_type = {
.name = " SystemH Register",
.unmask = enable_systemh_irq,
.mask = disable_systemh_irq,
.ack = mask_and_ack_systemh,
};
static void disable_systemh_irq(unsigned int irq)
{ {
if (systemh_irq_mask_register) { unsigned long val, mask = 0x01 << 1;
unsigned long val, mask = 0x01 << 1;
/* Clear the "irq"th bit in the mask and set it in the request */ /* Clear the "irq"th bit in the mask and set it in the request */
val = __raw_readl((unsigned long)systemh_irq_mask_register); val = __raw_readl((unsigned long)systemh_irq_mask_register);
val &= ~mask; val &= ~mask;
__raw_writel(val, (unsigned long)systemh_irq_mask_register); __raw_writel(val, (unsigned long)systemh_irq_mask_register);
val = __raw_readl((unsigned long)systemh_irq_request_register); val = __raw_readl((unsigned long)systemh_irq_request_register);
val |= mask; val |= mask;
__raw_writel(val, (unsigned long)systemh_irq_request_register); __raw_writel(val, (unsigned long)systemh_irq_request_register);
}
} }
static void enable_systemh_irq(unsigned int irq) static void enable_systemh_irq(struct irq_data *data)
{ {
if (systemh_irq_mask_register) { unsigned long val, mask = 0x01 << 1;
unsigned long val, mask = 0x01 << 1;
/* Set "irq"th bit in the mask register */ /* Set "irq"th bit in the mask register */
val = __raw_readl((unsigned long)systemh_irq_mask_register); val = __raw_readl((unsigned long)systemh_irq_mask_register);
val |= mask; val |= mask;
__raw_writel(val, (unsigned long)systemh_irq_mask_register); __raw_writel(val, (unsigned long)systemh_irq_mask_register);
}
} }
static void mask_and_ack_systemh(unsigned int irq) static struct irq_chip systemh_irq_type = {
{ .name = "SystemH Register",
disable_systemh_irq(irq); .irq_unmask = enable_systemh_irq,
} .irq_mask = disable_systemh_irq,
};
void make_systemh_irq(unsigned int irq) void make_systemh_irq(unsigned int irq)
{ {
disable_irq_nosync(irq); disable_irq_nosync(irq);
set_irq_chip_and_handler(irq, &systemh_irq_type, handle_level_irq); set_irq_chip_and_handler(irq, &systemh_irq_type, handle_level_irq);
disable_systemh_irq(irq); disable_systemh_irq(irq_get_irq_data(irq));
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment