projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-usb
[oweals/u-boot.git]
/
include
/
asm-ppc
/
4xx_pcie.h
diff --git
a/include/asm-ppc/4xx_pcie.h
b/include/asm-ppc/4xx_pcie.h
index d27d2a965ce7da89ef1fa39d9eebb92d830207fd..a0e88de11d4390bb38b2b2fb06f81ada33804223 100644
(file)
--- a/
include/asm-ppc/4xx_pcie.h
+++ b/
include/asm-ppc/4xx_pcie.h
@@
-8,17
+8,19
@@
* option) any later version.
*/
* option) any later version.
*/
-#include <ppc4xx.h>
#ifndef __4XX_PCIE_H
#define __4XX_PCIE_H
#ifndef __4XX_PCIE_H
#define __4XX_PCIE_H
+#include <ppc4xx.h>
+#include <pci.h>
+
#define DCRN_SDR0_CFGADDR 0x00e
#define DCRN_SDR0_CFGDATA 0x00f
#if defined(CONFIG_440SPE)
#define DCRN_SDR0_CFGADDR 0x00e
#define DCRN_SDR0_CFGDATA 0x00f
#if defined(CONFIG_440SPE)
-#define C
FG_PCIE_NR_PORTS
3
+#define C
ONFIG_SYS_PCIE_NR_PORTS
3
-#define C
FG_PCIE_ADDR_HIGH
0x0000000d
+#define C
ONFIG_SYS_PCIE_ADDR_HIGH
0x0000000d
#define DCRN_PCIE0_BASE 0x100
#define DCRN_PCIE1_BASE 0x120
#define DCRN_PCIE0_BASE 0x100
#define DCRN_PCIE1_BASE 0x120
@@
-30,9
+32,9
@@
#endif
#if defined(CONFIG_460EX) || defined(CONFIG_460GT)
#endif
#if defined(CONFIG_460EX) || defined(CONFIG_460GT)
-#define C
FG_PCIE_NR_PORTS
2
+#define C
ONFIG_SYS_PCIE_NR_PORTS
2
-#define C
FG_PCIE_ADDR_HIGH
0x0000000d
+#define C
ONFIG_SYS_PCIE_ADDR_HIGH
0x0000000d
#define DCRN_PCIE0_BASE 0x100
#define DCRN_PCIE1_BASE 0x120
#define DCRN_PCIE0_BASE 0x100
#define DCRN_PCIE1_BASE 0x120
@@
-42,9
+44,9
@@
#endif
#if defined(CONFIG_405EX)
#endif
#if defined(CONFIG_405EX)
-#define C
FG_PCIE_NR_PORTS
2
+#define C
ONFIG_SYS_PCIE_NR_PORTS
2
-#define C
FG_PCIE_ADDR_HIGH
0x00000000
+#define C
ONFIG_SYS_PCIE_ADDR_HIGH
0x00000000
#define DCRN_PCIE0_BASE 0x040
#define DCRN_PCIE1_BASE 0x060
#define DCRN_PCIE0_BASE 0x040
#define DCRN_PCIE1_BASE 0x060
@@
-395,6
+397,7
@@
static inline void mdelay(int n)
udelay(1000);
}
udelay(1000);
}
+#if defined(PCIE0_SDR)
static inline u32 sdr_base(int port)
{
switch (port) {
static inline u32 sdr_base(int port)
{
switch (port) {
@@
-403,11
+406,12
@@
static inline u32 sdr_base(int port)
return PCIE0_SDR;
case 1:
return PCIE1_SDR;
return PCIE0_SDR;
case 1:
return PCIE1_SDR;
-#if C
FG
_PCIE_NR_PORTS > 2
+#if C
ONFIG_SYS
_PCIE_NR_PORTS > 2
case 2:
return PCIE2_SDR;
#endif
}
}
case 2:
return PCIE2_SDR;
#endif
}
}
+#endif /* defined(PCIE0_SDR) */
#endif /* __4XX_PCIE_H */
#endif /* __4XX_PCIE_H */