openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gpio: iop: use readl/writel accessors 

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

Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Mikael Pettersson <mikpe@it.uu.se>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2013-09-09 16:54:32 +02:00
parent 7b85b867b9
commit e3f94b3857
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gpio/gpio-iop.c
View File

@ -17,6 +17,8 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/bitops.h>
#include <linux/io.h>
#define IOP3XX_N_GPIOS 8 #define IOP3XX_N_GPIOS 8
@ -29,38 +31,44 @@
static void __iomem *base; static void __iomem *base;
#define IOP3XX_GPIO_REG(reg) (base + (reg)) #define IOP3XX_GPIO_REG(reg) (base + (reg))
#define IOP3XX_GPOE (volatile u32 *)IOP3XX_GPIO_REG(0x0000) #define IOP3XX_GPOE IOP3XX_GPIO_REG(0x0000)
#define IOP3XX_GPID (volatile u32 *)IOP3XX_GPIO_REG(0x0004) #define IOP3XX_GPID IOP3XX_GPIO_REG(0x0004)
#define IOP3XX_GPOD (volatile u32 *)IOP3XX_GPIO_REG(0x0008) #define IOP3XX_GPOD IOP3XX_GPIO_REG(0x0008)
static void gpio_line_config(int line, int direction) static void gpio_line_config(int line, int direction)
{ {
unsigned long flags; unsigned long flags;
u32 val;
local_irq_save(flags); local_irq_save(flags);
val = readl(IOP3XX_GPOE);
if (direction == GPIO_IN) { if (direction == GPIO_IN) {
*IOP3XX_GPOE |= 1 << line; val |= BIT(line);
} else if (direction == GPIO_OUT) { } else if (direction == GPIO_OUT) {
*IOP3XX_GPOE &= ~(1 << line); val &= ~BIT(line);
} }
writel(val, IOP3XX_GPOE);
local_irq_restore(flags); local_irq_restore(flags);
} }
static int gpio_line_get(int line) 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) static void gpio_line_set(int line, int value)
{ {
unsigned long flags; unsigned long flags;
u32 val;
local_irq_save(flags); local_irq_save(flags);
val = readl(IOP3XX_GPOD);
if (value == GPIO_LOW) { if (value == GPIO_LOW) {
*IOP3XX_GPOD &= ~(1 << line); val &= ~BIT(line);
} else if (value == GPIO_HIGH) { } else if (value == GPIO_HIGH) {
*IOP3XX_GPOD |= 1 << line; val |= BIT(line);
} }
writel(val, IOP3XX_GPOD);
local_irq_restore(flags); local_irq_restore(flags);
} }