summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2010-09-24 15:22:15 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-09-27 09:23:34 +0200
commit683e4ef35797f702d5674410aca931a5cba570da (patch)
tree32b635b6ccfe60768df8f3c2499d2a484129ca25 /arch/arm
parent4bdfe4df0a2bbb4fcd5bd30da881037c106300e3 (diff)
downloadbarebox-683e4ef35797f702d5674410aca931a5cba570da.tar.gz
barebox-683e4ef35797f702d5674410aca931a5cba570da.tar.xz
Fix watchdog's register size for the i.MX27 CPU
commit 5bd9c57d575126448c7d325547538a55e5cd81d6 Author: Juergen Beisert <jbe@pengutronix.de> Date: Fri Sep 24 14:51:42 2010 +0200 Fix watchdog's register size for the i.MX27 CPU The watchdog registers on the i.MX27 CPU are 16 bit registers. This patch just fixes the access macro. Signed-off-by: Juergen Beisert <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-imx/include/mach/imx27-regs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/include/mach/imx27-regs.h b/arch/arm/mach-imx/include/mach/imx27-regs.h
index 8d0bcda726..f4354ba9b7 100644
--- a/arch/arm/mach-imx/include/mach/imx27-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx27-regs.h
@@ -83,9 +83,9 @@
#include "esdctl.h"
/* Watchdog Registers*/
-#define WCR __REG(IMX_WDT_BASE + 0x00) /* Watchdog Control Register */
-#define WSR __REG(IMX_WDT_BASE + 0x04) /* Watchdog Service Register */
-#define WSTR __REG(IMX_WDT_BASE + 0x08) /* Watchdog Status Register */
+#define WCR __REG16(IMX_WDT_BASE + 0x00) /* Watchdog Control Register */
+#define WSR __REG16(IMX_WDT_BASE + 0x02) /* Watchdog Service Register */
+#define WSTR __REG16(IMX_WDT_BASE + 0x04) /* Watchdog Status Register */
/* important definition of some bits of WCR */
#define WCR_WDE 0x04