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_pci_erratum9.c
diff --git
a/arch/ppc/syslib/m8260_pci_erratum9.c
b/arch/ppc/syslib/m8260_pci_erratum9.c
index
ae76a1b
..
1dc7e4e
100644
(file)
--- a/
arch/ppc/syslib/m8260_pci_erratum9.c
+++ b/
arch/ppc/syslib/m8260_pci_erratum9.c
@@
-31,7
+31,7
@@
#include <asm/immap_cpm2.h>
#include <asm/cpm2.h>
#include <asm/immap_cpm2.h>
#include <asm/cpm2.h>
-#include "m82
60
_pci.h"
+#include "m82
xx
_pci.h"
#ifdef CONFIG_8260_PCI9
/*#include <asm/mpc8260_pci9.h>*/ /* included in asm/io.h */
#ifdef CONFIG_8260_PCI9
/*#include <asm/mpc8260_pci9.h>*/ /* included in asm/io.h */
@@
-89,9
+89,8
@@
void idma_pci9_init(void)
volatile cpm2_map_t *immap = cpm2_immr;
/* allocate IDMA dpram */
volatile cpm2_map_t *immap = cpm2_immr;
/* allocate IDMA dpram */
- dpram_offset = cpm2_dpalloc(sizeof(idma_dpram_t), 64);
- idma_dpram =
- (volatile idma_dpram_t *)&immap->im_dprambase[dpram_offset];
+ dpram_offset = cpm_dpalloc(sizeof(idma_dpram_t), 64);
+ idma_dpram = cpm_dpram_addr(dpram_offset);
/* initialize the IDMA parameter RAM */
memset((void *)idma_dpram, 0, sizeof(idma_dpram_t));
/* initialize the IDMA parameter RAM */
memset((void *)idma_dpram, 0, sizeof(idma_dpram_t));
@@
-249,11
+248,11
@@
EXPORT_SYMBOL(idma_pci9_read_le);
static inline int is_pci_mem(unsigned long addr)
{
static inline int is_pci_mem(unsigned long addr)
{
- if (addr >= M
PC826
x_PCI_LOWER_MMIO &&
-
addr <= MPC826
x_PCI_UPPER_MMIO)
+ if (addr >= M
82x
x_PCI_LOWER_MMIO &&
+
addr <= M82x
x_PCI_UPPER_MMIO)
return 1;
return 1;
- if (addr >= M
PC826
x_PCI_LOWER_MEM &&
-
addr <= MPC826
x_PCI_UPPER_MEM)
+ if (addr >= M
82x
x_PCI_LOWER_MEM &&
+
addr <= M82x
x_PCI_UPPER_MEM)
return 1;
return 0;
}
return 1;
return 0;
}