Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

[karo-tx-uboot.git] / drivers / gpio / mxc_gpio.c

diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 7e65b39a7581df0928fb9168e6bf09c13cb93b93..2c79bff62b6376c659e6da6afb03ae411deec465 100644 (file)
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -41,12 +41,15 @@ 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_MX6Q)
        [3] = GPIO4_BASE_ADDR,
 #endif
-#if defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
+#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
        [4] = GPIO5_BASE_ADDR,
        [5] = GPIO6_BASE_ADDR,
+#endif
+#if defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
        [6] = GPIO7_BASE_ADDR,
 #endif
 };
@@ -54,7 +57,7 @@ static unsigned long gpio_ports[] = {
 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;
 
@@ -81,7 +84,7 @@ static int mxc_gpio_direction(unsigned int gpio,
 
 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;
 
@@ -104,7 +107,7 @@ int gpio_set_value(unsigned gpio, int value)
 
 int gpio_get_value(unsigned gpio)
 {
-       unsigned int port = gpio >> 5;
+       unsigned int port = GPIO_TO_PORT(gpio);
        struct gpio_regs *regs;
        u32 val;
 
@@ -115,14 +118,14 @@ int gpio_get_value(unsigned gpio)
 
        regs = (struct gpio_regs *)gpio_ports[port];
 
-       val = (readl(&regs->gpio_dr) >> gpio) & 0x01;
+       val = (readl(&regs->gpio_psr) >> gpio) & 0x01;
 
        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;
@@ -145,6 +148,5 @@ int gpio_direction_output(unsigned gpio, int value)
        if (ret < 0)
                return ret;
 
-       gpio_set_value(gpio, value);
-       return 0;
+       return gpio_set_value(gpio, value);
 }