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 1.9.5.x5
[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
..
4d49a97
100644
(file)
--- a/
arch/ppc/platforms/85xx/mpc85xx_cds_common.h
+++ b/
arch/ppc/platforms/85xx/mpc85xx_cds_common.h
@@
-60,8
+60,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
+73,4
@@
#define MPC85XX_PCI2_IO_SIZE 0x01000000
#define MPC85XX_PCI2_IO_SIZE 0x01000000
-#define SERIAL_PORT_DFNS \
- STD_UART_OP(0) \
- STD_UART_OP(1)
-
#endif /* __MACH_MPC85XX_CDS_H__ */
#endif /* __MACH_MPC85XX_CDS_H__ */