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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
4xx
/
ibm405ep.c
diff --git
a/arch/ppc/platforms/4xx/ibm405ep.c
b/arch/ppc/platforms/4xx/ibm405ep.c
index
fb48e82
..
fb3630a
100644
(file)
--- a/
arch/ppc/platforms/4xx/ibm405ep.c
+++ b/
arch/ppc/platforms/4xx/ibm405ep.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/ibm405ep.c
- *
* Support for IBM PPC 405EP processors.
*
* Author: SAW (IBM), derived from ibmnp405l.c.
* Support for IBM PPC 405EP processors.
*
* Author: SAW (IBM), derived from ibmnp405l.c.
@@
-12,7
+10,6
@@
* or implied.
*/
* or implied.
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/threads.h>
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/threads.h>
@@
-21,6
+18,7
@@
#include <asm/ibm4xx.h>
#include <asm/ocp.h>
#include <asm/ibm4xx.h>
#include <asm/ocp.h>
+#include <asm/ppc4xx_pic.h>
#include <platforms/4xx/ibm405ep.h>
#include <platforms/4xx/ibm405ep.h>
@@
-32,6
+30,7
@@
static struct ocp_func_mal_data ibm405ep_mal0_def = {
.txde_irq = 13, /* TX Descriptor Error IRQ */
.rxde_irq = 14, /* RX Descriptor Error IRQ */
.serr_irq = 10, /* MAL System Error IRQ */
.txde_irq = 13, /* TX Descriptor Error IRQ */
.rxde_irq = 14, /* RX Descriptor Error IRQ */
.serr_irq = 10, /* MAL System Error IRQ */
+ .dcr_base = DCRN_MAL_BASE /* MAL0_CFG DCR number */
};
OCP_SYSFS_MAL_DATA()
};
OCP_SYSFS_MAL_DATA()
@@
-132,3
+131,11
@@
struct ocp_def core_ocp[] = {
{ .vendor = OCP_VENDOR_INVALID
}
};
{ .vendor = OCP_VENDOR_INVALID
}
};
+
+/* Polarity and triggering settings for internal interrupt sources */
+struct ppc4xx_uic_settings ppc4xx_core_uic_cfg[] __initdata = {
+ { .polarity = 0xffff7f80,
+ .triggering = 0x00000000,
+ .ext_irq_mask = 0x0000007f, /* IRQ0 - IRQ6 */
+ }
+};