DM: GPIO: Fix da8xx GPIO indexing over GPIO 32

The GPIO banks are broken up into two 16-bit registers for each
bank set.  Unfortunately, the math that determines how to shift
blindly shifted by the number of the gpio.  This worked for gpio
numbers under 32, but higher gpio's are broken.  This fixes the
gpio index, so the bank is passed and the shift amount within
the register is passed now instead of the gpio number.

Fixes: b36a8947348c("dm: gpio: Add DM compatibility to
GPIO driver for Davinci")

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index 1a1d37ae2a42068b0935e69886b9bea25afbc4ff..3e95f039f0613968a434abbd40caf381cdf18aa4 100644 (file)
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/davinci_misc.h>
+#include <dt-bindings/gpio/gpio.h>
 
 #ifndef CONFIG_DM_GPIO
 static struct gpio_registry {
@@ -429,20 +430,27 @@ int gpio_set_value(unsigned int gpio, int value)
 static struct davinci_gpio *davinci_get_gpio_bank(struct udevice *dev, unsigned int offset)
 {
        struct davinci_gpio_bank *bank = dev_get_priv(dev);
+       unsigned int addr;
 
-       /* The device tree is not broken into banks but the infrastructure is
+       /*
+        * The device tree is not broken into banks but the infrastructure is
         * expecting it this way, so we'll first include the 0x10 offset, then
         * calculate the bank manually based on the offset.
+        * Casting 'addr' as Unsigned long is needed to make the math work.
         */
-
-       return ((struct davinci_gpio *)bank->base) + 0x10 + (offset >> 5);
+       addr = ((unsigned long)(struct davinci_gpio *)bank->base) +
+                       0x10 + (0x28 * (offset >> 5));
+       return (struct davinci_gpio *)addr;
 }
 
 static int davinci_gpio_direction_input(struct udevice *dev, unsigned int offset)
 {
        struct davinci_gpio *base = davinci_get_gpio_bank(dev, offset);
 
-       _gpio_direction_input(base, offset);
+       /*
+        * Fetch the address based on GPIO, but only pass the masked low 32-bits
+        */
+       _gpio_direction_input(base, (offset & 0x1f));
        return 0;
 }
 
@@ -451,7 +459,7 @@ static int davinci_gpio_direction_output(struct udevice *dev, unsigned int offse
 {
        struct davinci_gpio *base = davinci_get_gpio_bank(dev, offset);
 
-       _gpio_direction_output(base, offset, value);
+       _gpio_direction_output(base, (offset & 0x1f), value);
        return 0;
 }
 
@@ -459,7 +467,7 @@ static int davinci_gpio_get_value(struct udevice *dev, unsigned int offset)
 {
        struct davinci_gpio *base = davinci_get_gpio_bank(dev, offset);
 
-       return _gpio_get_value(base, offset);
+       return _gpio_get_value(base, (offset & 0x1f));
 }
 
 static int davinci_gpio_set_value(struct udevice *dev, unsigned int offset,
@@ -467,7 +475,7 @@ static int davinci_gpio_set_value(struct udevice *dev, unsigned int offset,
 {
        struct davinci_gpio *base = davinci_get_gpio_bank(dev, offset);
 
-       _gpio_set_value(base, offset, value);
+       _gpio_set_value(base, (offset & 0x1f), value);
 
        return 0;
 }