diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
| commit | 809b4e00baf006a990a73329ba381d536c6fa277 (patch) | |
| tree | e949e0efd019d6f932537aba762792b07a84351c /arch/arm/mach-at91/include/mach/at91x40.h | |
| parent | a0a55682b83fd5f012afadcf415b030d7424ae68 (diff) | |
| parent | 79a94c3538bda6869d7bb150b5e02dd3a72314dd (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-at91/include/mach/at91x40.h')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91x40.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91x40.h b/arch/arm/mach-at91/include/mach/at91x40.h index d34cdb8abdca..063ac44a0204 100644 --- a/arch/arm/mach-at91/include/mach/at91x40.h +++ b/arch/arm/mach-at91/include/mach/at91x40.h | |||
| @@ -52,4 +52,10 @@ | |||
| 52 | #define AT91_DBGU_CIDR (AT91_SF + 0) /* CIDR in PS segment */ | 52 | #define AT91_DBGU_CIDR (AT91_SF + 0) /* CIDR in PS segment */ |
| 53 | #define AT91_DBGU_EXID (AT91_SF + 4) /* EXID in PS segment */ | 53 | #define AT91_DBGU_EXID (AT91_SF + 4) /* EXID in PS segment */ |
| 54 | 54 | ||
| 55 | /* | ||
| 56 | * Support defines for the simple Power Controller module. | ||
| 57 | */ | ||
| 58 | #define AT91_PS_CR (AT91_PS + 0) /* PS Control register */ | ||
| 59 | #define AT91_PS_CR_CPU (1 << 0) /* CPU clock disable bit */ | ||
| 60 | |||
| 55 | #endif /* AT91X40_H */ | 61 | #endif /* AT91X40_H */ |