[PATCH 7/8] gpio: iop: use readl/writel accessors

[Linus Walleij]

Use the standard 32bit I/O accessors instead of just assigning
addresses.

Cc: Aaro Koskinen <aaro.koski...@iki.fi>
Cc: Lennert Buytenhek <ker...@wantstofly.org>
Cc: Dan Williams <dan.j.willi...@intel.com>
Cc: Mikael Pettersson <mi...@it.uu.se>
Signed-off-by: Linus Walleij <linus.wall...@linaro.org>
---
 drivers/gpio/gpio-iop.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/drivers/gpio/gpio-iop.c b/drivers/gpio/gpio-iop.c
index 24a86b0..0d991d7 100644
--- a/drivers/gpio/gpio-iop.c
+++ b/drivers/gpio/gpio-iop.c
@@ -17,6 +17,8 @@
 #include <linux/gpio.h>
 #include <linux/export.h>
 #include <linux/platform_device.h>
+#include <linux/bitops.h>
+#include <linux/io.h>
 
 #define IOP3XX_N_GPIOS 8
 
@@ -29,38 +31,44 @@
 static void __iomem *base;
 
 #define IOP3XX_GPIO_REG(reg)   (base + (reg))
-#define IOP3XX_GPOE            (volatile u32 *)IOP3XX_GPIO_REG(0x0000)
-#define IOP3XX_GPID            (volatile u32 *)IOP3XX_GPIO_REG(0x0004)
-#define IOP3XX_GPOD            (volatile u32 *)IOP3XX_GPIO_REG(0x0008)
+#define IOP3XX_GPOE            IOP3XX_GPIO_REG(0x0000)
+#define IOP3XX_GPID            IOP3XX_GPIO_REG(0x0004)
+#define IOP3XX_GPOD            IOP3XX_GPIO_REG(0x0008)
 
 static void gpio_line_config(int line, int direction)
 {
        unsigned long flags;
+       u32 val;
 
        local_irq_save(flags);
+       val = readl(IOP3XX_GPOE);
        if (direction == GPIO_IN) {
-               *IOP3XX_GPOE |= 1 << line;
+               val |= BIT(line);
        } else if (direction == GPIO_OUT) {
-               *IOP3XX_GPOE &= ~(1 << line);
+               val &= ~BIT(line);
        }
+       writel(val, IOP3XX_GPOE);
        local_irq_restore(flags);
 }
 
 static int gpio_line_get(int line)
 {
-       return !!(*IOP3XX_GPID & (1 << line));
+       return !!(readl(IOP3XX_GPID) & BIT(line));
 }
 
 static void gpio_line_set(int line, int value)
 {
        unsigned long flags;
+       u32 val;
 
        local_irq_save(flags);
+       val = readl(IOP3XX_GPOD);
        if (value == GPIO_LOW) {
-               *IOP3XX_GPOD &= ~(1 << line);
+               val &= ~BIT(line);
        } else if (value == GPIO_HIGH) {
-               *IOP3XX_GPOD |= 1 << line;
+               val |= BIT(line);
        }
+       writel(val, IOP3XX_GPOD);
        local_irq_restore(flags);
 }
 
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html