diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 01:16:30 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 01:16:30 -0500 |
| commit | 1e43bee9c70654b4d52472c19e5f0a0cc18b6b36 (patch) | |
| tree | ff601ec0c0d14125d0324f21b3c7e6d5e19fa252 /arch/arm/mach-kirkwood/include/mach/bridge-regs.h | |
| parent | 7d6709a20866a885916214590b7c394a21be9e25 (diff) | |
| parent | a8a8a669ea13d792296737505adc43ccacf3a648 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/arm/mach-kirkwood/include/mach/bridge-regs.h')
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h index 9e80d9232c83..418f5017c50e 100644 --- a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h +++ b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h | |||
| @@ -13,6 +13,9 @@ | |||
| 13 | 13 | ||
| 14 | #include <mach/kirkwood.h> | 14 | #include <mach/kirkwood.h> |
| 15 | 15 | ||
| 16 | #define CPU_CONFIG (BRIDGE_VIRT_BASE | 0x0100) | ||
| 17 | #define CPU_CONFIG_ERROR_PROP 0x00000004 | ||
| 18 | |||
| 16 | #define CPU_CONTROL (BRIDGE_VIRT_BASE | 0x0104) | 19 | #define CPU_CONTROL (BRIDGE_VIRT_BASE | 0x0104) |
| 17 | #define CPU_RESET 0x00000002 | 20 | #define CPU_RESET 0x00000002 |
| 18 | 21 | ||