Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0e5f82dda5e60a21cf8ba4f77334d60290277d2c
Commit:     0e5f82dda5e60a21cf8ba4f77334d60290277d2c
Parent:     f72267c30f5a08f9a77c97417ec120e6943195f8
Author:     Andrew Victor <[EMAIL PROTECTED]>
AuthorDate: Thu May 31 10:16:00 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Jun 3 17:52:35 2007 +0100

    [ARM] 4421/1: AT91: Value of _KEY fields.
    
    Use the actual value (0xA5) for the AT91_SHDW_KEY and AT91_WDT_KEY
    register fields instead of a bitmask.
    
    This is consistent with how AT91_RSTC_KEY is defined, and is easier to
    use in code.
    
    Signed-off-by: Andrew Victor <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 include/asm-arm/arch-at91/at91_shdwc.h |    4 ++--
 include/asm-arm/arch-at91/at91_wdt.h   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/asm-arm/arch-at91/at91_shdwc.h 
b/include/asm-arm/arch-at91/at91_shdwc.h
index 795fcc2..01b433d 100644
--- a/include/asm-arm/arch-at91/at91_shdwc.h
+++ b/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/include/asm-arm/arch-at91/at91_wdt.h 
b/include/asm-arm/arch-at91/at91_wdt.h
index 7251a34..1014e9b 100644
--- a/include/asm-arm/arch-at91/at91_wdt.h
+++ b/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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to