diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-02 20:53:19 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-02 20:53:19 +0300 |
| commit | c35102c3e15f90fe604523a2fbffd9dc158b455a (patch) | |
| tree | 0c248939a1f424701b583873360c91e081bfe810 /arch/arm/mach-realview/include/mach/board-pb1176.h | |
| parent | 20107f84b29536887b958e38b20474cccc619322 (diff) | |
| parent | 4b46d6416548fb6a0940dfd9911fd895eb6247b3 (diff) | |
| download | linux-c35102c3e15f90fe604523a2fbffd9dc158b455a.tar.xz | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: ensure initial page tables are setup for SMP systems
ARM: 5776/1: Check compiler version and EABI support when adding ARM unwind support.
ARM: 5774/1: Fix Realview ARM1176PB board reboot
ARM: Fix errata 411920 workarounds
ARM: Fix sparsemem with SPARSEMEM_EXTREME enabled
ARM: Use GFP_DMA only for masks _less_ than 32-bit
ARM: integrator: allow Integrator to be built with highmem
ARM: Fix signal restart issues with NX and OABI compat
Diffstat (limited to 'arch/arm/mach-realview/include/mach/board-pb1176.h')
| -rw-r--r-- | arch/arm/mach-realview/include/mach/board-pb1176.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/include/mach/board-pb1176.h b/arch/arm/mach-realview/include/mach/board-pb1176.h index 98f8e7eeacc2..34b80b7d40b8 100644 --- a/arch/arm/mach-realview/include/mach/board-pb1176.h +++ b/arch/arm/mach-realview/include/mach/board-pb1176.h @@ -73,4 +73,9 @@ #define REALVIEW_PB1176_GIC_DIST_BASE 0x10041000 /* GIC distributor, on FPGA */ #define REALVIEW_PB1176_L220_BASE 0x10110000 /* L220 registers */ +/* + * Control register SYS_RESETCTL is set to 1 to force a soft reset + */ +#define REALVIEW_PB1176_SYS_LOCKVAL_RSTCTL 0x0100 + #endif /* __ASM_ARCH_BOARD_PB1176_H */ |