mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 21/42] i.MX remove wdog registers from header files
Date: Tue, 19 Oct 2010 14:55:09 +0200	[thread overview]
Message-ID: <1287492930-15716-22-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1287492930-15716-1-git-send-email-s.hauer@pengutronix.de>

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-imx/clocksource.c             |   23 +++++++++++++++++++----
 arch/arm/mach-imx/include/mach/imx1-regs.h  |    8 --------
 arch/arm/mach-imx/include/mach/imx21-regs.h |    8 --------
 arch/arm/mach-imx/include/mach/imx27-regs.h |    8 --------
 arch/arm/mach-imx/include/mach/imx31-regs.h |   10 ----------
 arch/arm/mach-imx/include/mach/imx35-regs.h |   10 ----------
 arch/arm/mach-imx/include/mach/imx51-regs.h |    7 -------
 7 files changed, 19 insertions(+), 55 deletions(-)

diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c
index e492890..4cb923f 100644
--- a/arch/arm/mach-imx/clocksource.c
+++ b/arch/arm/mach-imx/clocksource.c
@@ -101,19 +101,34 @@ static int clocksource_init (void)
 core_initcall(clocksource_init);
 
 /*
+ * Watchdog Registers
+ */
+#ifdef CONFIG_ARCH_IMX1
+#define WDOG_WCR	0x00 /* Watchdog Control Register */
+#define WDOG_WSR	0x02 /* Watchdog Service Register */
+#define WDOG_WSTR	0x04 /* Watchdog Status Register  */
+#define WDOG_WCR_WDE	(1 << 0)
+#else
+#define WDOG_WCR	0x00 /* Watchdog Control Register */
+#define WDOG_WSR	0x02 /* Watchdog Service Register */
+#define WDOG_WSTR	0x04 /* Watchdog Status Register  */
+#define WDOG_WCR_WDE	(1 << 2)
+#endif
+
+/*
  * Reset the cpu by setting up the watchdog timer and let it time out
  */
 void __noreturn reset_cpu (unsigned long ignored)
 {
 	/* Disable watchdog and set Time-Out field to 0 */
-	WCR = 0x0000;
+	writew(0x0, IMX_WDT_BASE + WDOG_WCR);
 
 	/* Write Service Sequence */
-	WSR = 0x5555;
-	WSR = 0xAAAA;
+	writew(0x5555, IMX_WDT_BASE + WDOG_WSR);
+	writew(0xaaaa, IMX_WDT_BASE + WDOG_WSR);
 
 	/* Enable watchdog */
-	WCR = WCR_WDE;
+	writew(WDOG_WCR_WDE, IMX_WDT_BASE + WDOG_WCR);
 
 	while (1);
 	/*NOTREACHED*/
diff --git a/arch/arm/mach-imx/include/mach/imx1-regs.h b/arch/arm/mach-imx/include/mach/imx1-regs.h
index 0d6fd92..f940cdb 100644
--- a/arch/arm/mach-imx/include/mach/imx1-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx1-regs.h
@@ -40,14 +40,6 @@
 #define IMX_AITC_BASE              (0x23000 + IMX_IO_BASE)
 #define IMX_CSI_BASE               (0x24000 + IMX_IO_BASE)
 
-/* 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  */
-
-/* important definition of some bits of WCR */
-#define WCR_WDE 0x01
-
 /* SYSCTRL Registers */
 #define SIDR   __REG(IMX_SYSCTRL_BASE + 0x4) /* Silicon ID Register		    */
 #define FMCR   __REG(IMX_SYSCTRL_BASE + 0x8) /* Function Multiplex Control Register */
diff --git a/arch/arm/mach-imx/include/mach/imx21-regs.h b/arch/arm/mach-imx/include/mach/imx21-regs.h
index 6d64b81..a2c4d03 100644
--- a/arch/arm/mach-imx/include/mach/imx21-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx21-regs.h
@@ -72,14 +72,6 @@
 #define CS5L __REG(IMX_EIM_BASE + 0x2C) /* Chip Select 5 Lower Register    */
 #define EIM  __REG(IMX_EIM_BASE + 0x30) /* EIM Configuration Register      */
 
-/* Watchdog Registers*/
-#define WCR  __REG16(IMX_WDT_BASE + 0x00) /* Watchdog Control Register */
-#define WSR  __REG16(IMX_WDT_BASE + 0x02) /* Watchdog Service Register */
-#define WRSR __REG16(IMX_WDT_BASE + 0x04) /* Watchdog Reset Status Register  */
-
-/* important definition of some bits of WCR */
-#define WCR_WDE 0x04
-
 /* PLL registers */
 #define CSCR		__REG(IMX_PLL_BASE + 0x00) /* Clock Source Control Register       */
 #define MPCTL0		__REG(IMX_PLL_BASE + 0x04) /* MCU PLL Control Register 0          */
diff --git a/arch/arm/mach-imx/include/mach/imx27-regs.h b/arch/arm/mach-imx/include/mach/imx27-regs.h
index f4354ba..0fa954d 100644
--- a/arch/arm/mach-imx/include/mach/imx27-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx27-regs.h
@@ -82,14 +82,6 @@
 
 #include "esdctl.h"
 
-/* Watchdog Registers*/
-#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
-
 /* PLL registers */
 #define CSCR		__REG(IMX_PLL_BASE + 0x00) /* Clock Source Control Register       */
 #define MPCTL0		__REG(IMX_PLL_BASE + 0x04) /* MCU PLL Control Register 0          */
diff --git a/arch/arm/mach-imx/include/mach/imx31-regs.h b/arch/arm/mach-imx/include/mach/imx31-regs.h
index d2304ec..536bf0d 100644
--- a/arch/arm/mach-imx/include/mach/imx31-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx31-regs.h
@@ -120,16 +120,6 @@
 #endif
 
 /*
- * Watchdog Registers
- */
-#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
-
-/*
  * Clock Controller Module (CCM)
  */
 #define IMX_CCM_BASE	0x53f80000
diff --git a/arch/arm/mach-imx/include/mach/imx35-regs.h b/arch/arm/mach-imx/include/mach/imx35-regs.h
index b2b360a..b0f6b82 100644
--- a/arch/arm/mach-imx/include/mach/imx35-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx35-regs.h
@@ -135,15 +135,5 @@
 #define TSTAT_CAPT     (1<<1)  /* Capture event */
 #define TSTAT_COMP     (1)     /* Compare event */
 
-/*
- * Watchdog Registers
- */
-#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
-
 #endif /* __ASM_ARCH_MX35_REGS_H */
 
diff --git a/arch/arm/mach-imx/include/mach/imx51-regs.h b/arch/arm/mach-imx/include/mach/imx51-regs.h
index f99285c..1719a78 100644
--- a/arch/arm/mach-imx/include/mach/imx51-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx51-regs.h
@@ -24,13 +24,6 @@
 #define TSTAT_CAPT	(1<<1)	/* Capture event */
 #define TSTAT_COMP	(1)	/* Compare event */
 
-#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
-
 #define MX51_IROM_BASE_ADDR	0x0
 
 /*
-- 
1.7.2.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2010-10-19 12:55 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-19 12:54 sparse fixes Sascha Hauer
2010-10-19 12:54 ` [PATCH 01/42] glob: " Sascha Hauer
2010-10-19 12:54 ` [PATCH 02/42] fnmatch:sparse fixes Sascha Hauer
2010-10-19 12:54 ` [PATCH 03/42] readline: sparse fixes Sascha Hauer
2010-10-19 12:54 ` [PATCH 04/42] edit: " Sascha Hauer
2010-10-19 12:54 ` [PATCH 05/42] command.h: " Sascha Hauer
2010-10-19 12:54 ` [PATCH 06/42] crc32: " Sascha Hauer
2010-10-19 12:54 ` [PATCH 07/42] copy_file: " Sascha Hauer
2010-10-19 12:54 ` [PATCH 08/42] commands/mem.c: " Sascha Hauer
2010-10-19 12:54 ` [PATCH 09/42] dlmalloc: " Sascha Hauer
2010-10-19 12:54 ` [PATCH 10/42] console: " Sascha Hauer
2010-10-19 12:54 ` [PATCH 11/42] notifier: " Sascha Hauer
2010-10-19 12:55 ` [PATCH 12/42] fec_imx: " Sascha Hauer
2010-10-19 12:55 ` [PATCH 13/42] imx gpio: " Sascha Hauer
2010-10-19 12:55 ` [PATCH 14/42] imx clocksource: " Sascha Hauer
2010-10-19 12:55 ` [PATCH 15/42] armlinux: " Sascha Hauer
2010-10-19 12:55 ` [PATCH 16/42] arch/arm/cpu/cpu.c: " Sascha Hauer
2010-10-19 12:55 ` [PATCH 17/42] cache-l2x0: " Sascha Hauer
2010-10-19 12:55 ` [PATCH 18/42] speed-imx35: " Sascha Hauer
2010-10-19 12:55 ` [PATCH 19/42] imx_dump_clocks: " Sascha Hauer
2010-10-19 12:55 ` [PATCH 20/42] i.MX serial: " Sascha Hauer
2010-10-19 12:55 ` Sascha Hauer [this message]
2010-10-20  1:48   ` [PATCH 21/42] i.MX remove wdog registers from header files Jean-Christophe PLAGNIOL-VILLARD
2010-10-20  6:27     ` Sascha Hauer
2010-10-19 12:55 ` [PATCH 22/42] hush: sparse fixes Sascha Hauer
2010-10-19 12:55 ` [PATCH 23/42] ramfs: " Sascha Hauer
2010-10-19 12:55 ` [PATCH 24/42] common/env.c: " Sascha Hauer
2010-10-19 12:55 ` [PATCH 25/42] version_string: " Sascha Hauer
2010-10-19 12:55 ` [PATCH 26/42] imx-nand: " Sascha Hauer
2010-10-19 12:55 ` [PATCH 27/42] ping: make locally used functions static Sascha Hauer
2010-10-19 12:55 ` [PATCH 28/42] arm div0: sparse fixes Sascha Hauer
2010-10-19 12:55 ` [PATCH 29/42] edit: make locally used variable static Sascha Hauer
2010-10-19 12:55 ` [PATCH 30/42] common/environment.c: sparse fixes Sascha Hauer
2010-10-19 12:55 ` [PATCH 31/42] commands/mem.c: make locally used function static Sascha Hauer
2010-10-19 12:55 ` [PATCH 32/42] bootm: sparse fixes Sascha Hauer
2010-10-19 12:55 ` [PATCH 33/42] net: make locally used functions static Sascha Hauer
2010-10-19 12:55 ` [PATCH 34/42] lib/driver.c: sparse fixes Sascha Hauer
2010-10-19 12:55 ` [PATCH 35/42] remove dead ldiv code Sascha Hauer
2010-10-19 12:55 ` [PATCH 36/42] common/memsize.c: add missing include Sascha Hauer
2010-10-19 12:55 ` [PATCH 37/42] i.MX speed: " Sascha Hauer
2010-10-19 12:55 ` [PATCH 38/42] libbb: sparse fixes Sascha Hauer
2010-10-19 12:55 ` [PATCH 39/42] remove strange flush_cache functions Sascha Hauer
2010-10-19 12:55 ` [PATCH 40/42] pcm043: ifx compiler warning Sascha Hauer
2010-10-19 12:55 ` [PATCH 41/42] arm interrupts.c: sparse fixes Sascha Hauer
2010-10-19 12:55 ` [PATCH 42/42] process_escape_sequence: Add missing include Sascha Hauer

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=1287492930-15716-22-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.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