summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Zhao <richard.zhao@freescale.com>2010-07-15 10:57:14 +0800
committerJustin Waters <justin.waters@timesys.com>2010-12-17 12:10:48 -0500
commit82b2b5aa0a93f5ab0c12296765c2b32fe00e28c7 (patch)
treed2e2412f835b11f09d37a100f76d3b5c08d6fb7a
parent32b12454750b2cdd8fbf1e46f844b8c5ffd14f55 (diff)
ENGR00125169 MX5: only reset nfc in arch_reset when we have it
it fix mx50 reboot wdog reg write failed issue. Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
-rw-r--r--arch/arm/mach-mx5/system.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/system.c b/arch/arm/mach-mx5/system.c
index 669be9c4c9cb..da27fc4605a3 100644
--- a/arch/arm/mach-mx5/system.c
+++ b/arch/arm/mach-mx5/system.c
@@ -171,7 +171,8 @@ void arch_reset(char mode)
/* Workaround to reset NFC_CONFIG3 register
* due to the chip warm reset does not reset it
*/
- __raw_writel(0x20600, IO_ADDRESS(NFC_BASE_ADDR) + 0x28);
+ if (cpu_is_mx51() || cpu_is_mx53())
+ __raw_writel(0x20600, IO_ADDRESS(NFC_BASE_ADDR) + 0x28);
/* Assert SRS signal */
mxc_wd_reset();