From 775d6223b11c61d2a644e2c3c7dea922d077d971 Mon Sep 17 00:00:00 2001 From: Andrew Victor Date: Thu, 31 May 2007 10:16:00 +0100 Subject: [PATCH] --- yaml --- r: 57412 b: refs/heads/master c: 0e5f82dda5e60a21cf8ba4f77334d60290277d2c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-at91/at91_shdwc.h | 4 ++-- trunk/include/asm-arm/arch-at91/at91_wdt.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1d74b3db2b3b..7e604d06a690 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f72267c30f5a08f9a77c97417ec120e6943195f8 +refs/heads/master: 0e5f82dda5e60a21cf8ba4f77334d60290277d2c diff --git a/trunk/include/asm-arm/arch-at91/at91_shdwc.h b/trunk/include/asm-arm/arch-at91/at91_shdwc.h index 795fcc266228..01b433de2272 100644 --- a/trunk/include/asm-arm/arch-at91/at91_shdwc.h +++ b/trunk/include/asm-arm/arch-at91/at91_shdwc.h @@ -14,8 +14,8 @@ #define AT91_SHDWC_H #define AT91_SHDW_CR (AT91_SHDWC + 0x00) /* Shut Down Control Register */ -#define AT91_SHDW_SHDW (1 << 0) /* Processor Reset */ -#define AT91_SHDW_KEY (0xff << 24) /* KEY Password */ +#define AT91_SHDW_SHDW (1 << 0) /* Shut Down command */ +#define AT91_SHDW_KEY (0xa5 << 24) /* KEY Password */ #define AT91_SHDW_MR (AT91_SHDWC + 0x04) /* Shut Down Mode Register */ #define AT91_SHDW_WKMODE0 (3 << 0) /* Wake-up 0 Mode Selection */ diff --git a/trunk/include/asm-arm/arch-at91/at91_wdt.h b/trunk/include/asm-arm/arch-at91/at91_wdt.h index 7251a344c740..1014e9bf181f 100644 --- a/trunk/include/asm-arm/arch-at91/at91_wdt.h +++ b/trunk/include/asm-arm/arch-at91/at91_wdt.h @@ -15,7 +15,7 @@ #define AT91_WDT_CR (AT91_WDT + 0x00) /* Watchdog Control Register */ #define AT91_WDT_WDRSTT (1 << 0) /* Restart */ -#define AT91_WDT_KEY (0xff << 24) /* KEY Password */ +#define AT91_WDT_KEY (0xa5 << 24) /* KEY Password */ #define AT91_WDT_MR (AT91_WDT + 0x04) /* Watchdog Mode Register */ #define AT91_WDT_WDV (0xfff << 0) /* Counter Value */