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
vserver 2.0 rc7
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
m8260_setup.c
diff --git
a/arch/ppc/syslib/m8260_setup.c
b/arch/ppc/syslib/m8260_setup.c
index
f3c12a5
..
fda75d7
100644
(file)
--- a/
arch/ppc/syslib/m8260_setup.c
+++ b/
arch/ppc/syslib/m8260_setup.c
@@
-34,7
+34,8
@@
unsigned char __res[sizeof(bd_t)];
extern void cpm2_reset(void);
unsigned char __res[sizeof(bd_t)];
extern void cpm2_reset(void);
-extern void m8260_find_bridges(void);
+extern void pq2_find_bridges(void);
+extern void pq2pci_init_irq(void);
extern void idma_pci9_init(void);
/* Place-holder for board-specific init */
extern void idma_pci9_init(void);
/* Place-holder for board-specific init */
@@
-56,7
+57,7
@@
m8260_setup_arch(void)
idma_pci9_init();
#endif
#ifdef CONFIG_PCI_8260
idma_pci9_init();
#endif
#ifdef CONFIG_PCI_8260
-
m8260
_find_bridges();
+
pq2
_find_bridges();
#endif
#ifdef CONFIG_BLK_DEV_INITRD
if (initrd_start)
#endif
#ifdef CONFIG_BLK_DEV_INITRD
if (initrd_start)
@@
-167,18
+168,18
@@
m8260_show_cpuinfo(struct seq_file *m)
static void __init
m8260_init_IRQ(void)
{
static void __init
m8260_init_IRQ(void)
{
- int i;
-
- for ( i = 0 ; i < NR_SIU_INTS ; i++ )
- irq_desc[i].handler = &cpm2_pic;
+ cpm2_init_IRQ();
/* Initialize the default interrupt mapping priorities,
* in case the boot rom changed something on us.
*/
/* Initialize the default interrupt mapping priorities,
* in case the boot rom changed something on us.
*/
- cpm2_immr->im_intctl.ic_sicr = 0;
cpm2_immr->im_intctl.ic_siprr = 0x05309770;
cpm2_immr->im_intctl.ic_siprr = 0x05309770;
- cpm2_immr->im_intctl.ic_scprrh = 0x05309770;
- cpm2_immr->im_intctl.ic_scprrl = 0x05309770;
+
+#if defined(CONFIG_PCI) && (defined(CONFIG_ADS8272) || defined(CONFIG_PQ2FADS))
+ /* Initialize stuff for the 82xx CPLD IC and install demux */
+ pq2pci_init_irq();
+#endif
+
}
/*
}
/*