From: wellsk40@gmail.com (wellsk40 at gmail.com)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 12/16] ARM: LPC32XX: Watchdog reset type and sparse fixes
Date: Tue, 2 Feb 2010 15:59:24 -0800 [thread overview]
Message-ID: <1265155168-28909-13-git-send-email-wellsk40@gmail.com> (raw)
In-Reply-To: <LPC32XX architecture files (updated)>
From: Kevin Wells <wellsk40@gmail.com>
Changed the type used with the watchdog reset writel() function
to use void __iomem *
Signed-off-by: Kevin Wells <wellsk40@gmail.com>
---
arch/arm/mach-lpc32xx/common.c | 7 ++++---
arch/arm/mach-lpc32xx/common.h | 2 ++
arch/arm/mach-lpc32xx/irq.c | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c
index 2a97ce0..1efa3d1 100644
--- a/arch/arm/mach-lpc32xx/common.c
+++ b/arch/arm/mach-lpc32xx/common.c
@@ -36,7 +36,8 @@
#include <mach/platform.h>
#include "common.h"
-#define WDT_IOBASE io_p2v(LPC32XX_WDTIM_BASE)
+#define WDT_IOACCESS(x) (__force void __iomem *)\
+ io_p2v(LPC32XX_WDTIM_BASE + (x))
/*
* Watchdog timer
@@ -135,8 +136,8 @@ void lpc32xx_watchdog_reset(void)
LPC32XX_CLKPWR_TIMER_CLK_CTRL(CLKPWR_IOBASE));
/* Instand assert of RESETOUT_N with pulse length 1mS */
- writel(13000, WDT_IOBASE + 0x18);
- writel(0x70, WDT_IOBASE + 0xC);
+ writel(13000, WDT_IOACCESS(0x18));
+ writel(0x70, WDT_IOACCESS(0xC));
}
/*
diff --git a/arch/arm/mach-lpc32xx/common.h b/arch/arm/mach-lpc32xx/common.h
index 08fdfba..42c758e 100644
--- a/arch/arm/mach-lpc32xx/common.h
+++ b/arch/arm/mach-lpc32xx/common.h
@@ -73,4 +73,6 @@ extern void lpc32xx_get_uid(u32 devid[4]);
extern void printascii(const char *);
#endif
+extern void lpc32xx_watchdog_reset(void);
+
#endif
diff --git a/arch/arm/mach-lpc32xx/irq.c b/arch/arm/mach-lpc32xx/irq.c
index 3266856..a3ea5cc 100644
--- a/arch/arm/mach-lpc32xx/irq.c
+++ b/arch/arm/mach-lpc32xx/irq.c
@@ -30,6 +30,7 @@
#include <mach/irqs.h>
#include <mach/hardware.h>
#include <mach/platform.h>
+#include "common.h"
/*
* Default value represeting the Activation polarity of all internal
--
1.6.6
next prev parent reply other threads:[~2010-02-02 23:59 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <LPC32XX architecture files (updated)>
2010-02-02 23:59 ` LPC32XX arch updates from developer comments wellsk40 at gmail.com
2010-02-02 23:59 ` [PATCH 01/16] ARM: LPC32XX: clock lookups array should not be tagged __initdata wellsk40 at gmail.com
2010-02-03 10:08 ` Russell King - ARM Linux
2010-02-03 19:25 ` Kevin Wells
2010-02-04 9:59 ` Uwe Kleine-König
2010-02-02 23:59 ` [PATCH 02/16] ARM: LPC32XX: removed extra include statement wellsk40 at gmail.com
2010-02-03 10:08 ` Russell King - ARM Linux
2010-02-02 23:59 ` [PATCH 03/16] ARM: LPC32XX: Added LPC32XX identifier to high level macro names wellsk40 at gmail.com
2010-02-02 23:59 ` [PATCH 04/16] ARM: LPC32XX: Added LXP32XX identified to CLKPWR register field macros wellsk40 at gmail.com
2010-02-02 23:59 ` [PATCH 05/16] ARM: LPC32XX: Added LPC32XX identifier to INTC " wellsk40 at gmail.com
2010-02-02 23:59 ` [PATCH 06/16] ARM: LPC32XX: Added LPC32XX identifier to TIMER " wellsk40 at gmail.com
2010-02-02 23:59 ` [PATCH 07/16] ARM: LPC32XX: Added LPC32XX identifier to UART " wellsk40 at gmail.com
2010-02-02 23:59 ` [PATCH 08/16] ARM: LPC32XX: Added LPC32XX identifier to GPIO " wellsk40 at gmail.com
2010-02-02 23:59 ` [PATCH 09/16] ARM: LPC32XX: LPC32XX macro name changes and local macro use wellsk40 at gmail.com
2010-02-02 23:59 ` [PATCH 10/16] ARM: LPC32XX: Converted most register types to void __iomem * wellsk40 at gmail.com
2010-02-03 10:10 ` Russell King - ARM Linux
2010-02-03 10:18 ` Russell King - ARM Linux
2010-02-02 23:59 ` [PATCH 11/16] ARM: LPC32XX: Converted interrupt registers " wellsk40 at gmail.com
2010-02-04 10:05 ` Uwe Kleine-König
2010-02-02 23:59 ` wellsk40 at gmail.com [this message]
2010-02-02 23:59 ` [PATCH 13/16] ARM: LPC32XX: Various fixes with readl/writel types wellsk40 at gmail.com
2010-02-03 10:20 ` Russell King - ARM Linux
2010-02-02 23:59 ` [PATCH 14/16] ARM: LPC32XX: Several small sparse warning fixed wellsk40 at gmail.com
2010-02-02 23:59 ` [PATCH 15/16] ARM: LPC32XX: Updated device IRQ names with LPC32XX identifier wellsk40 at gmail.com
2010-02-02 23:59 ` [PATCH 16/16] ARM: LPC32XX: Fix sparse errors on LCD code wellsk40 at gmail.com
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=1265155168-28909-13-git-send-email-wellsk40@gmail.com \
--to=wellsk40@gmail.com \
--cc=linux-arm-kernel@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;
as well as URLs for NNTP newsgroup(s).