diff options
Diffstat (limited to 'arch/sh/boards/mach-se/7343/irq.c')
-rw-r--r-- | arch/sh/boards/mach-se/7343/irq.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sh/boards/mach-se/7343/irq.c b/arch/sh/boards/mach-se/7343/irq.c index c60fd13608d0..d4305c26e9f7 100644 --- a/arch/sh/boards/mach-se/7343/irq.c +++ b/arch/sh/boards/mach-se/7343/irq.c | |||
@@ -21,13 +21,13 @@ unsigned int se7343_fpga_irq[SE7343_FPGA_IRQ_NR] = { 0, }; | |||
21 | static void disable_se7343_irq(unsigned int irq) | 21 | static void disable_se7343_irq(unsigned int irq) |
22 | { | 22 | { |
23 | unsigned int bit = (unsigned int)get_irq_chip_data(irq); | 23 | unsigned int bit = (unsigned int)get_irq_chip_data(irq); |
24 | ctrl_outw(ctrl_inw(PA_CPLD_IMSK) | 1 << bit, PA_CPLD_IMSK); | 24 | __raw_writew(__raw_readw(PA_CPLD_IMSK) | 1 << bit, PA_CPLD_IMSK); |
25 | } | 25 | } |
26 | 26 | ||
27 | static void enable_se7343_irq(unsigned int irq) | 27 | static void enable_se7343_irq(unsigned int irq) |
28 | { | 28 | { |
29 | unsigned int bit = (unsigned int)get_irq_chip_data(irq); | 29 | unsigned int bit = (unsigned int)get_irq_chip_data(irq); |
30 | ctrl_outw(ctrl_inw(PA_CPLD_IMSK) & ~(1 << bit), PA_CPLD_IMSK); | 30 | __raw_writew(__raw_readw(PA_CPLD_IMSK) & ~(1 << bit), PA_CPLD_IMSK); |
31 | } | 31 | } |
32 | 32 | ||
33 | static struct irq_chip se7343_irq_chip __read_mostly = { | 33 | static struct irq_chip se7343_irq_chip __read_mostly = { |
@@ -39,7 +39,7 @@ static struct irq_chip se7343_irq_chip __read_mostly = { | |||
39 | 39 | ||
40 | static void se7343_irq_demux(unsigned int irq, struct irq_desc *desc) | 40 | static void se7343_irq_demux(unsigned int irq, struct irq_desc *desc) |
41 | { | 41 | { |
42 | unsigned short intv = ctrl_inw(PA_CPLD_ST); | 42 | unsigned short intv = __raw_readw(PA_CPLD_ST); |
43 | unsigned int ext_irq = 0; | 43 | unsigned int ext_irq = 0; |
44 | 44 | ||
45 | intv &= (1 << SE7343_FPGA_IRQ_NR) - 1; | 45 | intv &= (1 << SE7343_FPGA_IRQ_NR) - 1; |
@@ -59,8 +59,8 @@ void __init init_7343se_IRQ(void) | |||
59 | { | 59 | { |
60 | int i, irq; | 60 | int i, irq; |
61 | 61 | ||
62 | ctrl_outw(0, PA_CPLD_IMSK); /* disable all irqs */ | 62 | __raw_writew(0, PA_CPLD_IMSK); /* disable all irqs */ |
63 | ctrl_outw(0x2000, 0xb03fffec); /* mrshpc irq enable */ | 63 | __raw_writew(0x2000, 0xb03fffec); /* mrshpc irq enable */ |
64 | 64 | ||
65 | for (i = 0; i < SE7343_FPGA_IRQ_NR; i++) { | 65 | for (i = 0; i < SE7343_FPGA_IRQ_NR; i++) { |
66 | irq = create_irq(); | 66 | irq = create_irq(); |