git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
ppc8260_pic.c
diff --git
a/arch/ppc/syslib/cpm2_pic.c
b/arch/ppc/syslib/ppc8260_pic.c
similarity index 74%
rename from
arch/ppc/syslib/cpm2_pic.c
rename to
arch/ppc/syslib/ppc8260_pic.c
index
43eac41
..
7faeb90
100644
(file)
--- a/
arch/ppc/syslib/cpm2_pic.c
+++ b/
arch/ppc/syslib/ppc8260_pic.c
@@
-3,11
+3,11
@@
#include <linux/sched.h>
#include <linux/signal.h>
#include <asm/irq.h>
#include <linux/sched.h>
#include <linux/signal.h>
#include <asm/irq.h>
-#include <asm/immap_
cpm2
.h>
+#include <asm/immap_
8260
.h>
#include <asm/mpc8260.h>
#include <asm/mpc8260.h>
-#include "
cpm2
_pic.h"
+#include "
ppc8260
_pic.h"
-/* The
CPM2
internal interrupt controller. It is usually
+/* The
8260
internal interrupt controller. It is usually
* the only interrupt controller.
* There are two 32-bit registers (high/low) for up to 64
* possible interrupts.
* the only interrupt controller.
* There are two 32-bit registers (high/low) for up to 64
* possible interrupts.
@@
-40,7
+40,7
@@
static u_char irq_to_siubit[] = {
7, 6, 5, 4, 3, 2, 1, 0
};
7, 6, 5, 4, 3, 2, 1, 0
};
-static void
cpm2
_mask_irq(unsigned int irq_nr)
+static void
m8260
_mask_irq(unsigned int irq_nr)
{
int bit, word;
volatile uint *simr;
{
int bit, word;
volatile uint *simr;
@@
-48,12
+48,12
@@
static void cpm2_mask_irq(unsigned int irq_nr)
bit = irq_to_siubit[irq_nr];
word = irq_to_siureg[irq_nr];
bit = irq_to_siubit[irq_nr];
word = irq_to_siureg[irq_nr];
- simr = &(
cpm2_
immr->im_intctl.ic_simrh);
+ simr = &(immr->im_intctl.ic_simrh);
ppc_cached_irq_mask[word] &= ~(1 << (31 - bit));
simr[word] = ppc_cached_irq_mask[word];
}
ppc_cached_irq_mask[word] &= ~(1 << (31 - bit));
simr[word] = ppc_cached_irq_mask[word];
}
-static void
cpm2
_unmask_irq(unsigned int irq_nr)
+static void
m8260
_unmask_irq(unsigned int irq_nr)
{
int bit, word;
volatile uint *simr;
{
int bit, word;
volatile uint *simr;
@@
-61,12
+61,12
@@
static void cpm2_unmask_irq(unsigned int irq_nr)
bit = irq_to_siubit[irq_nr];
word = irq_to_siureg[irq_nr];
bit = irq_to_siubit[irq_nr];
word = irq_to_siureg[irq_nr];
- simr = &(
cpm2_
immr->im_intctl.ic_simrh);
+ simr = &(immr->im_intctl.ic_simrh);
ppc_cached_irq_mask[word] |= (1 << (31 - bit));
simr[word] = ppc_cached_irq_mask[word];
}
ppc_cached_irq_mask[word] |= (1 << (31 - bit));
simr[word] = ppc_cached_irq_mask[word];
}
-static void
cpm2
_mask_and_ack(unsigned int irq_nr)
+static void
m8260
_mask_and_ack(unsigned int irq_nr)
{
int bit, word;
volatile uint *simr, *sipnr;
{
int bit, word;
volatile uint *simr, *sipnr;
@@
-74,14
+74,14
@@
static void cpm2_mask_and_ack(unsigned int irq_nr)
bit = irq_to_siubit[irq_nr];
word = irq_to_siureg[irq_nr];
bit = irq_to_siubit[irq_nr];
word = irq_to_siureg[irq_nr];
- simr = &(
cpm2_
immr->im_intctl.ic_simrh);
- sipnr = &(
cpm2_
immr->im_intctl.ic_sipnrh);
+ simr = &(immr->im_intctl.ic_simrh);
+ sipnr = &(immr->im_intctl.ic_sipnrh);
ppc_cached_irq_mask[word] &= ~(1 << (31 - bit));
simr[word] = ppc_cached_irq_mask[word];
sipnr[word] = 1 << (31 - bit);
}
ppc_cached_irq_mask[word] &= ~(1 << (31 - bit));
simr[word] = ppc_cached_irq_mask[word];
sipnr[word] = 1 << (31 - bit);
}
-static void
cpm2
_end_irq(unsigned int irq_nr)
+static void
m8260
_end_irq(unsigned int irq_nr)
{
int bit, word;
volatile uint *simr;
{
int bit, word;
volatile uint *simr;
@@
-92,33
+92,33
@@
static void cpm2_end_irq(unsigned int irq_nr)
bit = irq_to_siubit[irq_nr];
word = irq_to_siureg[irq_nr];
bit = irq_to_siubit[irq_nr];
word = irq_to_siureg[irq_nr];
- simr = &(
cpm2_
immr->im_intctl.ic_simrh);
+ simr = &(immr->im_intctl.ic_simrh);
ppc_cached_irq_mask[word] |= (1 << (31 - bit));
simr[word] = ppc_cached_irq_mask[word];
}
}
ppc_cached_irq_mask[word] |= (1 << (31 - bit));
simr[word] = ppc_cached_irq_mask[word];
}
}
-struct hw_interrupt_type
cpm2
_pic = {
- "
CPM2
SIU ",
+struct hw_interrupt_type
ppc8260
_pic = {
+ "
8260
SIU ",
NULL,
NULL,
NULL,
NULL,
-
cpm2
_unmask_irq,
-
cpm2
_mask_irq,
-
cpm2
_mask_and_ack,
-
cpm2
_end_irq,
+
m8260
_unmask_irq,
+
m8260
_mask_irq,
+
m8260
_mask_and_ack,
+
m8260
_end_irq,
0
};
int
0
};
int
-
cpm2
_get_irq(struct pt_regs *regs)
+
m8260
_get_irq(struct pt_regs *regs)
{
int irq;
unsigned long bits;
{
int irq;
unsigned long bits;
- /* For
CPM2
, read the SIVEC register and shift the bits down
+ /* For
MPC8260
, read the SIVEC register and shift the bits down
* to get the irq number. */
* to get the irq number. */
- bits =
cpm2_
immr->im_intctl.ic_sivec;
+ bits = immr->im_intctl.ic_sivec;
irq = bits >> 26;
if (irq == 0)
irq = bits >> 26;
if (irq == 0)