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 df6bbbbc4befbaa15501aebb4eb7384e5ebb70ce..a3880641f0a8c73e64896b5b3512dc9dfbbf4297 100644
(file)
--- a/
drivers/gpio/mxc_gpio.c
+++ b/
drivers/gpio/mxc_gpio.c
@@
-34,18
+34,22
@@
enum mxc_gpio_direction {
MXC_GPIO_DIRECTION_OUT,
};
MXC_GPIO_DIRECTION_OUT,
};
+#define GPIO_TO_PORT(n) (n / 32)
/* GPIO port description */
static unsigned long gpio_ports[] = {
[0] = GPIO1_BASE_ADDR,
[1] = GPIO2_BASE_ADDR,
[2] = GPIO3_BASE_ADDR,
/* GPIO port description */
static unsigned long gpio_ports[] = {
[0] = GPIO1_BASE_ADDR,
[1] = GPIO2_BASE_ADDR,
[2] = GPIO3_BASE_ADDR,
-#if defined(CONFIG_MX51) || defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
+#if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX51) || \
+ defined(CONFIG_MX53) || 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
};
@@
-53,7
+57,7
@@
static unsigned long gpio_ports[] = {
static int mxc_gpio_direction(unsigned int gpio,
enum mxc_gpio_direction direction)
{
static int mxc_gpio_direction(unsigned int gpio,
enum mxc_gpio_direction direction)
{
- unsigned int port =
gpio >> 5
;
+ unsigned int port =
GPIO_TO_PORT(gpio)
;
struct gpio_regs *regs;
u32 l;
struct gpio_regs *regs;
u32 l;
@@
-80,7
+84,7
@@
static int mxc_gpio_direction(unsigned int gpio,
int gpio_set_value(unsigned gpio, int value)
{
int gpio_set_value(unsigned gpio, int value)
{
- unsigned int port =
gpio >> 5
;
+ unsigned int port =
GPIO_TO_PORT(gpio)
;
struct gpio_regs *regs;
u32 l;
struct gpio_regs *regs;
u32 l;
@@
-103,7
+107,7
@@
int gpio_set_value(unsigned gpio, int value)
int gpio_get_value(unsigned gpio)
{
int gpio_get_value(unsigned gpio)
{
- unsigned int port =
gpio >> 5
;
+ unsigned int port =
GPIO_TO_PORT(gpio)
;
struct gpio_regs *regs;
u32 val;
struct gpio_regs *regs;
u32 val;
@@
-114,14
+118,14
@@
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;
}
int gpio_request(unsigned gpio, const char *label)
{
return val;
}
int gpio_request(unsigned gpio, const char *label)
{
- unsigned int port =
gpio >> 5
;
+ unsigned int port =
GPIO_TO_PORT(gpio)
;
if (port >= ARRAY_SIZE(gpio_ports))
return -1;
return 0;
if (port >= ARRAY_SIZE(gpio_ports))
return -1;
return 0;
@@
-144,6
+148,5
@@
int gpio_direction_output(unsigned gpio, int value)
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- gpio_set_value(gpio, value);
- return 0;
+ return gpio_set_value(gpio, value);
}
}