diff options
author | Mark A. Greer <mgreer@mvista.com> | 2005-09-03 18:55:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:00 -0400 |
commit | d01c08c9ae91c1526d4564b400b3e0e04b49d1ba (patch) | |
tree | a1cc06a5342fdaf6185d2655a636cc181d56cb08 /include/asm-ppc/mv64x60_defs.h | |
parent | bbde630b553d349307fe719486bc06f8cf9c1a2d (diff) |
[PATCH] ppc32: mv64x60 updates & enhancements
Updates and enhancement to the ppc32 mv64x60 code:
- move code to get mem size from mem ctlr to bootwrapper
- address some errata in the mv64360 pic code
- some minor cleanups
- export one of the bridge's regs via sysfs so user daemon can watch for
extraction events
Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-ppc/mv64x60_defs.h')
-rw-r--r-- | include/asm-ppc/mv64x60_defs.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/asm-ppc/mv64x60_defs.h b/include/asm-ppc/mv64x60_defs.h index 2f428746c02b..f8f7f16b9b53 100644 --- a/include/asm-ppc/mv64x60_defs.h +++ b/include/asm-ppc/mv64x60_defs.h | |||
@@ -333,7 +333,7 @@ | |||
333 | /* | 333 | /* |
334 | ***************************************************************************** | 334 | ***************************************************************************** |
335 | * | 335 | * |
336 | * SRAM Cotnroller Registers | 336 | * SRAM Controller Registers |
337 | * | 337 | * |
338 | ***************************************************************************** | 338 | ***************************************************************************** |
339 | */ | 339 | */ |
@@ -352,7 +352,7 @@ | |||
352 | /* | 352 | /* |
353 | ***************************************************************************** | 353 | ***************************************************************************** |
354 | * | 354 | * |
355 | * SDRAM/MEM Cotnroller Registers | 355 | * SDRAM/MEM Controller Registers |
356 | * | 356 | * |
357 | ***************************************************************************** | 357 | ***************************************************************************** |
358 | */ | 358 | */ |
@@ -375,6 +375,7 @@ | |||
375 | /* SDRAM Control Registers */ | 375 | /* SDRAM Control Registers */ |
376 | #define MV64360_D_UNIT_CONTROL_LOW 0x1404 | 376 | #define MV64360_D_UNIT_CONTROL_LOW 0x1404 |
377 | #define MV64360_D_UNIT_CONTROL_HIGH 0x1424 | 377 | #define MV64360_D_UNIT_CONTROL_HIGH 0x1424 |
378 | #define MV64460_D_UNIT_MMASK 0x14b0 | ||
378 | 379 | ||
379 | /* SDRAM Error Report Registers (64360) */ | 380 | /* SDRAM Error Report Registers (64360) */ |
380 | #define MV64360_SDRAM_ERR_DATA_LO 0x1444 | 381 | #define MV64360_SDRAM_ERR_DATA_LO 0x1444 |
@@ -388,7 +389,7 @@ | |||
388 | /* | 389 | /* |
389 | ***************************************************************************** | 390 | ***************************************************************************** |
390 | * | 391 | * |
391 | * Device/BOOT Cotnroller Registers | 392 | * Device/BOOT Controller Registers |
392 | * | 393 | * |
393 | ***************************************************************************** | 394 | ***************************************************************************** |
394 | */ | 395 | */ |
@@ -680,6 +681,8 @@ | |||
680 | #define MV64x60_PCI1_SLAVE_P2P_IO_REMAP 0x0dec | 681 | #define MV64x60_PCI1_SLAVE_P2P_IO_REMAP 0x0dec |
681 | #define MV64x60_PCI1_SLAVE_CPU_REMAP 0x0df0 | 682 | #define MV64x60_PCI1_SLAVE_CPU_REMAP 0x0df0 |
682 | 683 | ||
684 | #define MV64360_PCICFG_CPCI_HOTSWAP 0x68 | ||
685 | |||
683 | /* | 686 | /* |
684 | ***************************************************************************** | 687 | ***************************************************************************** |
685 | * | 688 | * |