From: Jan Altenberg <jan@linutronix.de>
To: andrew@sanpeople.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2.6.20-rc7] at91: correct value for AT91_RSTC_KEY
Date: Thu, 01 Feb 2007 17:17:08 +0100 [thread overview]
Message-ID: <1170346628.20424.12.camel@jan-laptop> (raw)
- 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 <jan@linutronix.de>
---
arch/arm/mach-at91rm9200/at91sam9260.c | 2 +-
arch/arm/mach-at91rm9200/at91sam9261.c | 2 +-
include/asm-arm/arch-at91rm9200/at91_rstc.h | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
Index: linux-2.6/arch/arm/mach-at91rm9200/at91sam9260.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-at91rm9200/at91sam9260.c
+++ linux-2.6/arch/arm/mach-at91rm9200/at91sam9260.c
@@ -213,7 +213,7 @@ static struct at91_gpio_bank at91sam9260
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);
}
Index: linux-2.6/arch/arm/mach-at91rm9200/at91sam9261.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-at91rm9200/at91sam9261.c
+++ linux-2.6/arch/arm/mach-at91rm9200/at91sam9261.c
@@ -208,7 +208,7 @@ static struct at91_gpio_bank at91sam9261
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);
}
Index: linux-2.6/include/asm-arm/arch-at91rm9200/at91_rstc.h
===================================================================
--- linux-2.6.orig/include/asm-arm/arch-at91rm9200/at91_rstc.h
+++ linux-2.6/include/asm-arm/arch-at91rm9200/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
reply other threads:[~2007-02-01 16:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1170346628.20424.12.camel@jan-laptop \
--to=jan@linutronix.de \
--cc=andrew@sanpeople.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®