projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[powerpc.git]
/
arch
/
ppc
/
syslib
/
ppc85xx_setup.c
diff --git
a/arch/ppc/syslib/ppc85xx_setup.c
b/arch/ppc/syslib/ppc85xx_setup.c
index
b7242f1
..
1a47ff4
100644
(file)
--- a/
arch/ppc/syslib/ppc85xx_setup.c
+++ b/
arch/ppc/syslib/ppc85xx_setup.c
@@
-3,7
+3,7
@@
*
* MPC85XX common board code
*
*
* MPC85XX common board code
*
- * Maintainer: Kumar Gala <
kumar.gala@freescale.com
>
+ * Maintainer: Kumar Gala <
galak@kernel.crashing.org
>
*
* Copyright 2004 Freescale Semiconductor Inc.
*
*
* Copyright 2004 Freescale Semiconductor Inc.
*
@@
-29,6
+29,7
@@
#include <asm/mmu.h>
#include <asm/ppc_sys.h>
#include <asm/kgdb.h>
#include <asm/mmu.h>
#include <asm/ppc_sys.h>
#include <asm/kgdb.h>
+#include <asm/machdep.h>
#include <syslib/ppc85xx_setup.h>
#include <syslib/ppc85xx_setup.h>
@@
-184,8
+185,8
@@
mpc85xx_setup_pci1(struct pci_controller *hose)
pci->powar1 = 0x80044000 |
(__ilog2(MPC85XX_PCI1_UPPER_MEM - MPC85XX_PCI1_LOWER_MEM + 1) - 1);
pci->powar1 = 0x80044000 |
(__ilog2(MPC85XX_PCI1_UPPER_MEM - MPC85XX_PCI1_LOWER_MEM + 1) - 1);
- /* Setup outboud IO windows @ MPC85XX_PCI1_IO_BASE */
- pci->potar2 =
0x00000000
;
+ /* Setup outbou
n
d IO windows @ MPC85XX_PCI1_IO_BASE */
+ pci->potar2 =
(MPC85XX_PCI1_LOWER_IO >> 12) & 0x000fffff
;
pci->potear2 = 0x00000000;
pci->powbar2 = (MPC85XX_PCI1_IO_BASE >> 12) & 0x000fffff;
/* Enable, IO R/W */
pci->potear2 = 0x00000000;
pci->powbar2 = (MPC85XX_PCI1_IO_BASE >> 12) & 0x000fffff;
/* Enable, IO R/W */
@@
-235,8
+236,8
@@
mpc85xx_setup_pci2(struct pci_controller *hose)
pci->powar1 = 0x80044000 |
(__ilog2(MPC85XX_PCI2_UPPER_MEM - MPC85XX_PCI2_LOWER_MEM + 1) - 1);
pci->powar1 = 0x80044000 |
(__ilog2(MPC85XX_PCI2_UPPER_MEM - MPC85XX_PCI2_LOWER_MEM + 1) - 1);
- /* Setup outboud IO windows @ MPC85XX_PCI2_IO_BASE */
- pci->potar2 =
0x00000000
;
+ /* Setup outbou
n
d IO windows @ MPC85XX_PCI2_IO_BASE */
+ pci->potar2 =
(MPC85XX_PCI2_LOWER_IO >> 12) & 0x000fffff;
;
pci->potear2 = 0x00000000;
pci->powbar2 = (MPC85XX_PCI2_IO_BASE >> 12) & 0x000fffff;
/* Enable, IO R/W */
pci->potear2 = 0x00000000;
pci->powbar2 = (MPC85XX_PCI2_IO_BASE >> 12) & 0x000fffff;
/* Enable, IO R/W */