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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
85xx
/
mpc85xx_cds_common.h
diff --git
a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
b/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
index
a7290ed
..
62df54f
100644
(file)
--- a/
arch/ppc/platforms/85xx/mpc85xx_cds_common.h
+++ b/
arch/ppc/platforms/85xx/mpc85xx_cds_common.h
@@
-1,9
+1,7
@@
/*
/*
- * arch/ppc/platforms/85xx/mpc85xx_cds_common.h
- *
* MPC85xx CDS board definitions
*
* MPC85xx CDS board definitions
*
- * Maintainer: Kumar Gala <
kumar.gala@freescale.com
>
+ * Maintainer: Kumar Gala <
galak@kernel.crashing.org
>
*
* Copyright 2004 Freescale Semiconductor, Inc
*
*
* Copyright 2004 Freescale Semiconductor, Inc
*
@@
-33,6
+31,10
@@
#define CM_CSR (1)
#define CM_RST (2)
#define CM_CSR (1)
#define CM_RST (2)
+/* CDS NVRAM/RTC */
+#define CDS_RTC_ADDR (0xf8000000)
+#define CDS_RTC_SIZE (8 * 1024)
+
/* PCI config */
#define PCI1_CFG_ADDR_OFFSET (0x8000)
#define PCI1_CFG_DATA_OFFSET (0x8004)
/* PCI config */
#define PCI1_CFG_ADDR_OFFSET (0x8000)
#define PCI1_CFG_DATA_OFFSET (0x8004)
@@
-60,8
+62,10
@@
#define MPC85XX_PCI1_IO_SIZE 0x01000000
/* PCI 2 memory map */
#define MPC85XX_PCI1_IO_SIZE 0x01000000
/* PCI 2 memory map */
-#define MPC85XX_PCI2_LOWER_IO 0x01000000
-#define MPC85XX_PCI2_UPPER_IO 0x01ffffff
+/* Note: the standard PPC fixups will cause IO space to get bumped by
+ * hose->io_base_virt - isa_io_base => MPC85XX_PCI1_IO_SIZE */
+#define MPC85XX_PCI2_LOWER_IO 0x00000000
+#define MPC85XX_PCI2_UPPER_IO 0x00ffffff
#define MPC85XX_PCI2_LOWER_MEM 0xa0000000
#define MPC85XX_PCI2_UPPER_MEM 0xbfffffff
#define MPC85XX_PCI2_LOWER_MEM 0xa0000000
#define MPC85XX_PCI2_UPPER_MEM 0xbfffffff
@@
-71,8
+75,7
@@
#define MPC85XX_PCI2_IO_SIZE 0x01000000
#define MPC85XX_PCI2_IO_SIZE 0x01000000
-#define SERIAL_PORT_DFNS \
- STD_UART_OP(0) \
- STD_UART_OP(1)
+#define NR_8259_INTS 16
+#define CPM_IRQ_OFFSET NR_8259_INTS
#endif /* __MACH_MPC85XX_CDS_H__ */
#endif /* __MACH_MPC85XX_CDS_H__ */