Merge branch 'drm-next-4.7' of git://people.freedesktop.org/~agd5f/linux into drm...

[linux-2.6-microblaze.git] / drivers / gpio / gpio-tc3589x.c

diff --git a/drivers/gpio/gpio-tc3589x.c b/drivers/gpio/gpio-tc3589x.c
index 4f566e6..2e35ed3 100644 (file)
--- a/drivers/gpio/gpio-tc3589x.c
+++ b/drivers/gpio/gpio-tc3589x.c
@@ -6,14 +6,14 @@
  * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
  */
 
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 #include <linux/of.h>
 #include <linux/interrupt.h>
 #include <linux/mfd/tc3589x.h>
+#include <linux/bitops.h>
 
 /*
  * These registers are modified under the irq bus lock and cached to avoid
@@ -39,7 +39,7 @@ static int tc3589x_gpio_get(struct gpio_chip *chip, unsigned offset)
        struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(chip);
        struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
        u8 reg = TC3589x_GPIODATA0 + (offset / 8) * 2;
-       u8 mask = 1 << (offset % 8);
+       u8 mask = BIT(offset % 8);
        int ret;
 
        ret = tc3589x_reg_read(tc3589x, reg);
@@ -55,7 +55,7 @@ static void tc3589x_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
        struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
        u8 reg = TC3589x_GPIODATA0 + (offset / 8) * 2;
        unsigned pos = offset % 8;
-       u8 data[] = {!!val << pos, 1 << pos};
+       u8 data[] = {val ? BIT(pos) : 0, BIT(pos)};
 
        tc3589x_block_write(tc3589x, reg, ARRAY_SIZE(data), data);
 }
@@ -70,7 +70,7 @@ static int tc3589x_gpio_direction_output(struct gpio_chip *chip,
 
        tc3589x_gpio_set(chip, offset, val);
 
-       return tc3589x_set_bits(tc3589x, reg, 1 << pos, 1 << pos);
+       return tc3589x_set_bits(tc3589x, reg, BIT(pos), BIT(pos));
 }
 
 static int tc3589x_gpio_direction_input(struct gpio_chip *chip,
@@ -81,7 +81,47 @@ static int tc3589x_gpio_direction_input(struct gpio_chip *chip,
        u8 reg = TC3589x_GPIODIR0 + offset / 8;
        unsigned pos = offset % 8;
 
-       return tc3589x_set_bits(tc3589x, reg, 1 << pos, 0);
+       return tc3589x_set_bits(tc3589x, reg, BIT(pos), 0);
+}
+
+static int tc3589x_gpio_single_ended(struct gpio_chip *chip,
+                                    unsigned offset,
+                                    enum single_ended_mode mode)
+{
+       struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(chip);
+       struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
+       /*
+        * These registers are alterated at each second address
+        * ODM bit 0 = drive to GND or Hi-Z (open drain)
+        * ODM bit 1 = drive to VDD or Hi-Z (open source)
+        */
+       u8 odmreg = TC3589x_GPIOODM0 + (offset / 8) * 2;
+       u8 odereg = TC3589x_GPIOODE0 + (offset / 8) * 2;
+       unsigned pos = offset % 8;
+       int ret;
+
+       switch(mode) {
+       case LINE_MODE_OPEN_DRAIN:
+               /* Set open drain mode */
+               ret = tc3589x_set_bits(tc3589x, odmreg, BIT(pos), 0);
+               if (ret)
+                       return ret;
+               /* Enable open drain/source mode */
+               return tc3589x_set_bits(tc3589x, odereg, BIT(pos), BIT(pos));
+       case LINE_MODE_OPEN_SOURCE:
+               /* Set open source mode */
+               ret = tc3589x_set_bits(tc3589x, odmreg, BIT(pos), BIT(pos));
+               if (ret)
+                       return ret;
+               /* Enable open drain/source mode */
+               return tc3589x_set_bits(tc3589x, odereg, BIT(pos), BIT(pos));
+       case LINE_MODE_PUSH_PULL:
+               /* Disable open drain/source mode */
+               return tc3589x_set_bits(tc3589x, odereg, BIT(pos), 0);
+       default:
+               break;
+       }
+       return -ENOTSUPP;
 }
 
 static struct gpio_chip template_chip = {
@@ -91,6 +131,7 @@ static struct gpio_chip template_chip = {
        .get                    = tc3589x_gpio_get,
        .direction_output       = tc3589x_gpio_direction_output,
        .set                    = tc3589x_gpio_set,
+       .set_single_ended       = tc3589x_gpio_single_ended,
        .can_sleep              = true,
 };
 
@@ -100,7 +141,7 @@ static int tc3589x_gpio_irq_set_type(struct irq_data *d, unsigned int type)
        struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(gc);
        int offset = d->hwirq;
        int regoffset = offset / 8;
-       int mask = 1 << (offset % 8);
+       int mask = BIT(offset % 8);
 
        if (type == IRQ_TYPE_EDGE_BOTH) {
                tc3589x_gpio->regs[REG_IBE][regoffset] |= mask;
@@ -165,7 +206,7 @@ static void tc3589x_gpio_irq_mask(struct irq_data *d)
        struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(gc);
        int offset = d->hwirq;
        int regoffset = offset / 8;
-       int mask = 1 << (offset % 8);
+       int mask = BIT(offset % 8);
 
        tc3589x_gpio->regs[REG_IE][regoffset] &= ~mask;
 }
@@ -176,7 +217,7 @@ static void tc3589x_gpio_irq_unmask(struct irq_data *d)
        struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(gc);
        int offset = d->hwirq;
        int regoffset = offset / 8;
-       int mask = 1 << (offset % 8);
+       int mask = BIT(offset % 8);
 
        tc3589x_gpio->regs[REG_IE][regoffset] |= mask;
 }
@@ -311,13 +352,3 @@ static int __init tc3589x_gpio_init(void)
        return platform_driver_register(&tc3589x_gpio_driver);
 }
 subsys_initcall(tc3589x_gpio_init);
-
-static void __exit tc3589x_gpio_exit(void)
-{
-       platform_driver_unregister(&tc3589x_gpio_driver);
-}
-module_exit(tc3589x_gpio_exit);
-
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("TC3589x GPIO driver");
-MODULE_AUTHOR("Hanumath Prasad, Rabin Vincent");