ARM: sa11x0/pxa: convert OS timer registers to IOMEM

Make the OS timer registers have IOMEM like properities so they can
be passed to readl_relaxed/writel_relaxed() et.al. rather than being
straight volatile dereferences.  Add linux/io.h includes where
required.

linux/io.h includes added to arch/arm/mach-sa1100/cpu-sa1100.c,
 arch/arm/mach-sa1100/jornada720_ssp.c, arch/arm/mach-sa1100/leds-lart.c
 drivers/input/touchscreen/jornada720_ts.c, drivers/pcmcia/sa1100_shannon.c
from Arnd.

This fixes these warnings:

arch/arm/mach-sa1100/time.c: In function 'sa1100_timer_init':
arch/arm/mach-sa1100/time.c:104: warning: passing argument 1 of 'clocksource_mmio_init' discards qualifiers from pointer target type
arch/arm/mach-pxa/time.c: In function 'pxa_timer_init':
arch/arm/mach-pxa/time.c:126: warning: passing argument 1 of 'clocksource_mmio_init' discards qualifiers from pointer target type

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index 54984deb856..ccd6b29e21b 100644
--- a/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@ -54,10 +54,10 @@ static int sa1100dog_open(struct inode *inode, struct file *file)
                 return -EBUSY;
 
         /* Activate SA1100 Watchdog timer */
-        OSMR3 = OSCR + pre_margin;
-        OSSR = OSSR_M3;
-        OWER = OWER_WME;
-        OIER |= OIER_E3;
+        writel_relaxed(readl_relaxed(OSCR) + pre_margin, OSMR3);
+        writel_relaxed(OSSR_M3, OSSR);
+        writel_relaxed(OWER_WME, OWER);
+        writel_relaxed(readl_relaxed(OIER) | OIER_E3, OIER);
         return nonseekable_open(inode, file);
 }
 
@@ -80,7 +80,7 @@ static ssize_t sa1100dog_write(struct file *file, const char __user *data,
 {
         if (len)
                 /* Refresh OSMR3 timer. */
-                OSMR3 = OSCR + pre_margin;
+                writel_relaxed(readl_relaxed(OSCR) + pre_margin, OSMR3);
         return len;
 }
 
@@ -114,7 +114,7 @@ static long sa1100dog_ioctl(struct file *file, unsigned int cmd,
                 break;
 
         case WDIOC_KEEPALIVE:
-                OSMR3 = OSCR + pre_margin;
+                writel_relaxed(readl_relaxed(OSCR) + pre_margin, OSMR3);
                 ret = 0;
                 break;
 
@@ -129,7 +129,7 @@ static long sa1100dog_ioctl(struct file *file, unsigned int cmd,
                 }
 
                 pre_margin = oscr_freq * time;
-                OSMR3 = OSCR + pre_margin;
+                writel_relaxed(readl_relaxed(OSCR) + pre_margin, OSMR3);
                 /*fall through*/
 
         case WDIOC_GETTIMEOUT: