commit 685533646f4ff17a84ec9265cabb60af325b6e1f
author Maxim Artamonov <scn1874@yandex.ru> Wed Dec 03 05:38:17 2008 +0300
committer Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Sat Jan 24 17:49:04 2009 +0100
tree 2373a1b51398bd20d1923da0a49e2a09ced155d9
parent 8f86a3636ef88427f880610638e80991adc41896

bugfix for i.mx31 CCM_UPCTL reg

Signed-off-by: Maxim Artamonov <scn1874 at yandex.ru>

include/asm-arm/arch-mx31/mx31-regs.h

diff --git a/include/asm-arm/arch-mx31/mx31-regs.h b/include/asm-arm/arch-mx31/mx31-regs.h
index b04a718..e736052 100644
--- a/include/asm-arm/arch-mx31/mx31-regs.h
+++ b/include/asm-arm/arch-mx31/mx31-regs.h
@@ -34,7 +34,7 @@
 #define CCM_PDR1	(CCM_BASE + 0x08)
 #define CCM_RCSR	(CCM_BASE + 0x0c)
 #define CCM_MPCTL	(CCM_BASE + 0x10)
-#define CCM_UPCTL	(CCM_BASE + 0x10)
+#define CCM_UPCTL	(CCM_BASE + 0x14)
 #define CCM_SPCTL	(CCM_BASE + 0x18)
 #define CCM_COSR	(CCM_BASE + 0x1C)
 #define CCM_CGR0	(CCM_BASE + 0x20)