]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
gpio: pca953x: Introduce a long awaited ->get_direction()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 22 Mar 2017 14:11:11 +0000 (16:11 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 23 Mar 2017 09:40:13 +0000 (10:40 +0100)
Introduce ->get_direction() callback for the driver.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
[Removed use of GPIOF_DIR* flags]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-pca953x.c

index d44232aadb6c2224301f45aa665af998e4aa9a4b..782d9adb55b9e8db902d7dc0d2983ddcb09b2abd 100644 (file)
@@ -363,6 +363,21 @@ exit:
        mutex_unlock(&chip->i2c_lock);
 }
 
+static int pca953x_gpio_get_direction(struct gpio_chip *gc, unsigned off)
+{
+       struct pca953x_chip *chip = gpiochip_get_data(gc);
+       u32 reg_val;
+       int ret;
+
+       mutex_lock(&chip->i2c_lock);
+       ret = pca953x_read_single(chip, chip->regs->direction, &reg_val, off);
+       mutex_unlock(&chip->i2c_lock);
+       if (ret < 0)
+               return ret;
+
+       return !!(reg_val & (1u << (off % BANK_SZ)));
+}
+
 static void pca953x_gpio_set_multiple(struct gpio_chip *gc,
                                      unsigned long *mask, unsigned long *bits)
 {
@@ -408,6 +423,7 @@ static void pca953x_setup_gpio(struct pca953x_chip *chip, int gpios)
        gc->direction_output = pca953x_gpio_direction_output;
        gc->get = pca953x_gpio_get_value;
        gc->set = pca953x_gpio_set_value;
+       gc->get_direction = pca953x_gpio_get_direction;
        gc->set_multiple = pca953x_gpio_set_multiple;
        gc->can_sleep = true;