aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ep93xx
diff options
context:
space:
mode:
authorRyan Mallon <ryan@bluewatersys.com>2009-07-15 16:51:59 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-07-17 08:35:59 -0400
commitfbeeea5386ab213bd55b223f3a75c823fccd6df5 (patch)
tree461a11076094589136b0bd0febb6e71c6763ef41 /arch/arm/mach-ep93xx
parent595c050d89e91e91cca3845e48b01042677bd19e (diff)
[ARM] 5607/1: ep93xx: Use __iomem pointer on syscon write function
Change the reg argument of the ep93xx_syscon_swlocked_write function to be an __iomem pointer. Fixes a number of build warnings. Signed-off-by: Ryan Mallon <ryan@bluewatersys.com> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ep93xx')
-rw-r--r--arch/arm/mach-ep93xx/core.c2
-rw-r--r--arch/arm/mach-ep93xx/include/mach/platform.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 4c38941a92c7..b390c35f8bc1 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -377,7 +377,7 @@ void __init ep93xx_init_irq(void)
377 */ 377 */
378static DEFINE_SPINLOCK(syscon_swlock); 378static DEFINE_SPINLOCK(syscon_swlock);
379 379
380void ep93xx_syscon_swlocked_write(unsigned int val, unsigned int reg) 380void ep93xx_syscon_swlocked_write(unsigned int val, void __iomem *reg)
381{ 381{
382 unsigned long flags; 382 unsigned long flags;
383 383
diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h
index fb5e59a3ea04..0af0a3ba7047 100644
--- a/arch/arm/mach-ep93xx/include/mach/platform.h
+++ b/arch/arm/mach-ep93xx/include/mach/platform.h
@@ -17,7 +17,7 @@ void ep93xx_init_irq(void);
17void ep93xx_init_time(unsigned long); 17void ep93xx_init_time(unsigned long);
18 18
19/* EP93xx System Controller software locked register write */ 19/* EP93xx System Controller software locked register write */
20void ep93xx_syscon_swlocked_write(unsigned int val, unsigned int reg); 20void ep93xx_syscon_swlocked_write(unsigned int val, void __iomem *reg);
21void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits); 21void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits);
22 22
23static inline void ep93xx_devcfg_set_bits(unsigned int bits) 23static inline void ep93xx_devcfg_set_bits(unsigned int bits)