From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 09/12] ARM i.MX clocksource: put registers in iomem space
Date: Mon, 25 Jun 2012 19:38:27 +0200 [thread overview]
Message-ID: <1340645910-15668-10-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1340645910-15668-1-git-send-email-s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-imx/clocksource.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c
index 4f5895c..4e77ece 100644
--- a/arch/arm/mach-imx/clocksource.c
+++ b/arch/arm/mach-imx/clocksource.c
@@ -38,7 +38,7 @@
#include <io.h>
#define GPT(x) __REG(IMX_TIM1_BASE + (x))
-#define timer_base (IMX_TIM1_BASE)
+#define timer_base IOMEM(IMX_TIM1_BASE)
static uint64_t imx_clocksource_read(void)
{
@@ -120,15 +120,17 @@ core_initcall(clocksource_init);
*/
void __noreturn reset_cpu (unsigned long addr)
{
+ void __iomem *wdt = IOMEM(IMX_WDT_BASE);
+
/* Disable watchdog and set Time-Out field to 0 */
- writew(0x0, IMX_WDT_BASE + WDOG_WCR);
+ writew(0x0, wdt + WDOG_WCR);
/* Write Service Sequence */
- writew(0x5555, IMX_WDT_BASE + WDOG_WSR);
- writew(0xaaaa, IMX_WDT_BASE + WDOG_WSR);
+ writew(0x5555, wdt + WDOG_WSR);
+ writew(0xaaaa, wdt + WDOG_WSR);
/* Enable watchdog */
- writew(WDOG_WCR_WDE, IMX_WDT_BASE + WDOG_WCR);
+ writew(WDOG_WCR_WDE, wdt + WDOG_WCR);
while (1);
/*NOTREACHED*/
--
1.7.10
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2012-06-25 17:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-25 17:38 [PATCH] sparse fixes Sascha Hauer
2012-06-25 17:38 ` [PATCH 01/12] MMC i.MX esdhc: Fix sparse warnings Sascha Hauer
2012-06-25 17:38 ` [PATCH 02/12] tlsf: Use NULL instead of 0 for returning NULL pointers Sascha Hauer
2012-06-25 17:38 ` [PATCH 03/12] qsort: declare strcmp_compar publically Sascha Hauer
2012-06-25 17:38 ` [PATCH 04/12] Do not use iomem space for dev_get_mem_region Sascha Hauer
2012-06-25 17:38 ` [PATCH 05/12] define __user empty Sascha Hauer
2012-06-25 17:38 ` [PATCH 06/12] ARM i.MX speed: sparse fixes Sascha Hauer
2012-06-25 17:38 ` [PATCH 07/12] USB ohci: Fix sparse warnings Sascha Hauer
2012-06-25 17:38 ` [PATCH 08/12] net smc911x: Use __iomem for register base Sascha Hauer
2012-06-25 17:38 ` Sascha Hauer [this message]
2012-06-25 17:38 ` [PATCH 10/12] USB gadget fsl: Put registers into iomem space Sascha Hauer
2012-06-25 17:38 ` [PATCH 11/12] fs FAT: fix warning: Using plain integer as NULL pointer Sascha Hauer
2012-06-25 17:38 ` [PATCH 12/12] of: Fix usage of 0 " 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=1340645910-15668-10-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