summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-10-15 08:26:55 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-10-21 22:21:23 +0200
commit9702299b4285a1c3f407a0d6cea491374dc40547 (patch)
tree7819016ca51cb88002d97af5c296e719442e7630 /arch
parent884273c24f2184bb855689e37cb8d5b037e17152 (diff)
downloadbarebox-9702299b4285a1c3f407a0d6cea491374dc40547.tar.gz
barebox-9702299b4285a1c3f407a0d6cea491374dc40547.tar.xz
imx gpio: sparse fixes
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/gpio.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/gpio.c b/arch/arm/mach-imx/gpio.c
index c6a59a66cf..0a3e0461eb 100644
--- a/arch/arm/mach-imx/gpio.c
+++ b/arch/arm/mach-imx/gpio.c
@@ -27,6 +27,7 @@
#include <errno.h>
#include <asm/io.h>
#include <mach/imx-regs.h>
+#include <mach/gpio.h>
#if defined CONFIG_ARCH_IMX1 || defined CONFIG_ARCH_IMX21 || defined CONFIG_ARCH_IMX27
#define GPIO_DR 0x1c
@@ -47,20 +48,20 @@
#define GPIO_ISR 0x18
#endif
-extern void *imx_gpio_base[];
+extern void __iomem *imx_gpio_base[];
extern int imx_gpio_count;
-static void *gpio_get_base(unsigned gpio)
+static void __iomem *gpio_get_base(unsigned gpio)
{
if (gpio >= imx_gpio_count)
- return 0;
+ return NULL;
return imx_gpio_base[gpio / 32];
}
void gpio_set_value(unsigned gpio, int value)
{
- void *base = gpio_get_base(gpio);
+ void __iomem *base = gpio_get_base(gpio);
int shift = gpio % 32;
u32 val;
@@ -79,7 +80,7 @@ void gpio_set_value(unsigned gpio, int value)
int gpio_direction_input(unsigned gpio)
{
- void *base = gpio_get_base(gpio);
+ void __iomem *base = gpio_get_base(gpio);
int shift = gpio % 32;
u32 val;
@@ -96,7 +97,7 @@ int gpio_direction_input(unsigned gpio)
int gpio_direction_output(unsigned gpio, int value)
{
- void *base = gpio_get_base(gpio);
+ void __iomem *base = gpio_get_base(gpio);
int shift = gpio % 32;
u32 val;
@@ -114,7 +115,7 @@ int gpio_direction_output(unsigned gpio, int value)
int gpio_get_value(unsigned gpio)
{
- void *base = gpio_get_base(gpio);
+ void __iomem *base = gpio_get_base(gpio);
int shift = gpio % 32;
u32 val;