diff options
Diffstat (limited to 'arch/m68k/platform/coldfire/intc-5272.c')
-rw-r--r-- | arch/m68k/platform/coldfire/intc-5272.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/m68k/platform/coldfire/intc-5272.c b/arch/m68k/platform/coldfire/intc-5272.c index 7160e618b0a..d7b695629a7 100644 --- a/arch/m68k/platform/coldfire/intc-5272.c +++ b/arch/m68k/platform/coldfire/intc-5272.c | |||
@@ -86,7 +86,7 @@ static void intc_irq_mask(struct irq_data *d) | |||
86 | u32 v; | 86 | u32 v; |
87 | irq -= MCFINT_VECBASE; | 87 | irq -= MCFINT_VECBASE; |
88 | v = 0x8 << intc_irqmap[irq].index; | 88 | v = 0x8 << intc_irqmap[irq].index; |
89 | writel(v, MCF_MBAR + intc_irqmap[irq].icr); | 89 | writel(v, intc_irqmap[irq].icr); |
90 | } | 90 | } |
91 | } | 91 | } |
92 | 92 | ||
@@ -98,7 +98,7 @@ static void intc_irq_unmask(struct irq_data *d) | |||
98 | u32 v; | 98 | u32 v; |
99 | irq -= MCFINT_VECBASE; | 99 | irq -= MCFINT_VECBASE; |
100 | v = 0xd << intc_irqmap[irq].index; | 100 | v = 0xd << intc_irqmap[irq].index; |
101 | writel(v, MCF_MBAR + intc_irqmap[irq].icr); | 101 | writel(v, intc_irqmap[irq].icr); |
102 | } | 102 | } |
103 | } | 103 | } |
104 | 104 | ||
@@ -111,10 +111,10 @@ static void intc_irq_ack(struct irq_data *d) | |||
111 | irq -= MCFINT_VECBASE; | 111 | irq -= MCFINT_VECBASE; |
112 | if (intc_irqmap[irq].ack) { | 112 | if (intc_irqmap[irq].ack) { |
113 | u32 v; | 113 | u32 v; |
114 | v = readl(MCF_MBAR + intc_irqmap[irq].icr); | 114 | v = readl(intc_irqmap[irq].icr); |
115 | v &= (0x7 << intc_irqmap[irq].index); | 115 | v &= (0x7 << intc_irqmap[irq].index); |
116 | v |= (0x8 << intc_irqmap[irq].index); | 116 | v |= (0x8 << intc_irqmap[irq].index); |
117 | writel(v, MCF_MBAR + intc_irqmap[irq].icr); | 117 | writel(v, intc_irqmap[irq].icr); |
118 | } | 118 | } |
119 | } | 119 | } |
120 | } | 120 | } |
@@ -127,12 +127,12 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type) | |||
127 | irq -= MCFINT_VECBASE; | 127 | irq -= MCFINT_VECBASE; |
128 | if (intc_irqmap[irq].ack) { | 128 | if (intc_irqmap[irq].ack) { |
129 | u32 v; | 129 | u32 v; |
130 | v = readl(MCF_MBAR + MCFSIM_PITR); | 130 | v = readl(MCFSIM_PITR); |
131 | if (type == IRQ_TYPE_EDGE_FALLING) | 131 | if (type == IRQ_TYPE_EDGE_FALLING) |
132 | v &= ~(0x1 << (32 - irq)); | 132 | v &= ~(0x1 << (32 - irq)); |
133 | else | 133 | else |
134 | v |= (0x1 << (32 - irq)); | 134 | v |= (0x1 << (32 - irq)); |
135 | writel(v, MCF_MBAR + MCFSIM_PITR); | 135 | writel(v, MCFSIM_PITR); |
136 | } | 136 | } |
137 | } | 137 | } |
138 | return 0; | 138 | return 0; |
@@ -163,10 +163,10 @@ void __init init_IRQ(void) | |||
163 | int irq, edge; | 163 | int irq, edge; |
164 | 164 | ||
165 | /* Mask all interrupt sources */ | 165 | /* Mask all interrupt sources */ |
166 | writel(0x88888888, MCF_MBAR + MCFSIM_ICR1); | 166 | writel(0x88888888, MCFSIM_ICR1); |
167 | writel(0x88888888, MCF_MBAR + MCFSIM_ICR2); | 167 | writel(0x88888888, MCFSIM_ICR2); |
168 | writel(0x88888888, MCF_MBAR + MCFSIM_ICR3); | 168 | writel(0x88888888, MCFSIM_ICR3); |
169 | writel(0x88888888, MCF_MBAR + MCFSIM_ICR4); | 169 | writel(0x88888888, MCFSIM_ICR4); |
170 | 170 | ||
171 | for (irq = 0; (irq < NR_IRQS); irq++) { | 171 | for (irq = 0; (irq < NR_IRQS); irq++) { |
172 | irq_set_chip(irq, &intc_irq_chip); | 172 | irq_set_chip(irq, &intc_irq_chip); |