Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=dd1d2f4439af3bc80c047a13a8a2be60df1953cd
Commit: dd1d2f4439af3bc80c047a13a8a2be60df1953cd
Parent: f1e1398654eb97269590a5a76f0aedb607fe5d0f
Author: Jan Altenberg <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 16 01:37:10 2007 -0800
Committer: Russell King <[EMAIL PROTECTED]>
CommitDate: Fri Feb 16 13:06:01 2007 +0000
[ARM] at91: correct value for AT91_RSTC_KEY
- Remove a duplicated define for AT91_RSTC_KEY
- Set AT91_RSTC_KEY to the correct value
- Replace the hardcoded keys in at91sam9620.c and at91sam9261.c
by AT91_RSTC_KEY
Signed-off-by: Jan Altenberg <[EMAIL PROTECTED]>
Acked-by: Andrew Victor <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
arch/arm/mach-at91/at91sam9260.c | 2 +-
arch/arm/mach-at91/at91sam9261.c | 2 +-
include/asm-arm/arch-at91/at91_rstc.h | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 003c27c..6ea41d8 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -259,7 +259,7 @@ static struct at91_gpio_bank at91sam9260_gpio[] = {
static void at91sam9260_reset(void)
{
- at91_sys_write(AT91_RSTC_CR, (0xA5 << 24) | AT91_RSTC_PROCRST |
AT91_RSTC_PERRST);
+ at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST |
AT91_RSTC_PERRST);
}
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
index 1a91023..784d1e6 100644
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@ -225,7 +225,7 @@ static struct at91_gpio_bank at91sam9261_gpio[] = {
static void at91sam9261_reset(void)
{
- at91_sys_write(AT91_RSTC_CR, (0xA5 << 24) | AT91_RSTC_PROCRST |
AT91_RSTC_PERRST);
+ at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST |
AT91_RSTC_PERRST);
}
diff --git a/include/asm-arm/arch-at91/at91_rstc.h
b/include/asm-arm/arch-at91/at91_rstc.h
index 0b7afbc..fb8d161 100644
--- a/include/asm-arm/arch-at91/at91_rstc.h
+++ b/include/asm-arm/arch-at91/at91_rstc.h
@@ -17,7 +17,7 @@
#define AT91_RSTC_PROCRST (1 << 0) /*
Processor Reset */
#define AT91_RSTC_PERRST (1 << 2) /*
Peripheral Reset */
#define AT91_RSTC_EXTRST (1 << 3) /*
External Reset */
-#define AT91_RSTC_KEY (0xff << 24) /* KEY
Password */
+#define AT91_RSTC_KEY (0xa5 << 24) /* KEY
Password */
#define AT91_RSTC_SR (AT91_RSTC + 0x04) /* Reset Controller
Status Register */
#define AT91_RSTC_URSTS (1 << 0) /* User
Reset Status */
@@ -34,6 +34,5 @@
#define AT91_RSTC_URSTEN (1 << 0) /* User
Reset Enable */
#define AT91_RSTC_URSTIEN (1 << 4) /* User
Reset Interrupt Enable */
#define AT91_RSTC_ERSTL (0xf << 8) /*
External Reset Length */
-#define AT91_RSTC_KEY (0xff << 24) /* KEY
Password */
#endif
-
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
