projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
drivers
/
gpio
/
mxc_gpio.c
diff --git
a/drivers/gpio/mxc_gpio.c
b/drivers/gpio/mxc_gpio.c
index 661553552e6875d40cad956a82bcef9ac7057b57..a3880641f0a8c73e64896b5b3512dc9dfbbf4297 100644
(file)
--- a/
drivers/gpio/mxc_gpio.c
+++ b/
drivers/gpio/mxc_gpio.c
@@
-41,13
+41,15
@@
static unsigned long gpio_ports[] = {
[0] = GPIO1_BASE_ADDR,
[1] = GPIO2_BASE_ADDR,
[2] = GPIO3_BASE_ADDR,
[0] = GPIO1_BASE_ADDR,
[1] = GPIO2_BASE_ADDR,
[2] = GPIO3_BASE_ADDR,
-#if defined(CONFIG_MX25) || defined(CONFIG_MX
51) || defined(CONFIG_MX53
) || \
- defined(CONFIG_MX
6Q
)
+#if defined(CONFIG_MX25) || defined(CONFIG_MX
27) || defined(CONFIG_MX51
) || \
+ defined(CONFIG_MX
53) || defined(CONFIG_MX6
)
[3] = GPIO4_BASE_ADDR,
#endif
[3] = GPIO4_BASE_ADDR,
#endif
-#if defined(CONFIG_MX
53) || defined(CONFIG_MX6Q
)
+#if defined(CONFIG_MX
27) || defined(CONFIG_MX53) || defined(CONFIG_MX6
)
[4] = GPIO5_BASE_ADDR,
[5] = GPIO6_BASE_ADDR,
[4] = GPIO5_BASE_ADDR,
[5] = GPIO6_BASE_ADDR,
+#endif
+#if defined(CONFIG_MX53) || defined(CONFIG_MX6)
[6] = GPIO7_BASE_ADDR,
#endif
};
[6] = GPIO7_BASE_ADDR,
#endif
};
@@
-116,7
+118,7
@@
int gpio_get_value(unsigned gpio)
regs = (struct gpio_regs *)gpio_ports[port];
regs = (struct gpio_regs *)gpio_ports[port];
- val = (readl(®s->gpio_
d
r) >> gpio) & 0x01;
+ val = (readl(®s->gpio_
ps
r) >> gpio) & 0x01;
return val;
}
return val;
}