Merge tag 'pinctrl-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[uclinux-h8/linux.git] / drivers / gpio / gpio-bcm-kona.c

diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
index cb89f37..8333f87 100644 (file)
--- a/drivers/gpio/gpio-bcm-kona.c
+++ b/drivers/gpio/gpio-bcm-kona.c
@@ -122,6 +122,16 @@ static void bcm_kona_gpio_unlock_gpio(struct bcm_kona_gpio *kona_gpio,
        spin_unlock_irqrestore(&kona_gpio->lock, flags);
 }
 
+static int bcm_kona_gpio_get_dir(struct gpio_chip *chip, unsigned gpio)
+{
+       struct bcm_kona_gpio *kona_gpio = to_kona_gpio(chip);
+       void __iomem *reg_base = kona_gpio->reg_base;
+       u32 val;
+
+       val = readl(reg_base + GPIO_CONTROL(gpio)) & GPIO_GPCTR0_IOTR_MASK;
+       return val ? GPIOF_DIR_IN : GPIOF_DIR_OUT;
+}
+
 static void bcm_kona_gpio_set(struct gpio_chip *chip, unsigned gpio, int value)
 {
        struct bcm_kona_gpio *kona_gpio;
@@ -135,12 +145,8 @@ static void bcm_kona_gpio_set(struct gpio_chip *chip, unsigned gpio, int value)
        reg_base = kona_gpio->reg_base;
        spin_lock_irqsave(&kona_gpio->lock, flags);
 
-       /* determine the GPIO pin direction */
-       val = readl(reg_base + GPIO_CONTROL(gpio));
-       val &= GPIO_GPCTR0_IOTR_MASK;
-
        /* this function only applies to output pin */
-       if (GPIO_GPCTR0_IOTR_CMD_INPUT == val)
+       if (bcm_kona_gpio_get_dir(chip, gpio) == GPIOF_DIR_IN)
                goto out;
 
        reg_offset = value ? GPIO_OUT_SET(bank_id) : GPIO_OUT_CLEAR(bank_id);
@@ -166,13 +172,12 @@ static int bcm_kona_gpio_get(struct gpio_chip *chip, unsigned gpio)
        reg_base = kona_gpio->reg_base;
        spin_lock_irqsave(&kona_gpio->lock, flags);
 
-       /* determine the GPIO pin direction */
-       val = readl(reg_base + GPIO_CONTROL(gpio));
-       val &= GPIO_GPCTR0_IOTR_MASK;
+       if (bcm_kona_gpio_get_dir(chip, gpio) == GPIOF_DIR_IN)
+               reg_offset = GPIO_IN_STATUS(bank_id);
+       else
+               reg_offset = GPIO_OUT_STATUS(bank_id);
 
        /* read the GPIO bank status */
-       reg_offset = (GPIO_GPCTR0_IOTR_CMD_INPUT == val) ?
-           GPIO_IN_STATUS(bank_id) : GPIO_OUT_STATUS(bank_id);
        val = readl(reg_base + reg_offset);
 
        spin_unlock_irqrestore(&kona_gpio->lock, flags);
@@ -310,6 +315,7 @@ static struct gpio_chip template_chip = {
        .owner = THIS_MODULE,
        .request = bcm_kona_gpio_request,
        .free = bcm_kona_gpio_free,
+       .get_direction = bcm_kona_gpio_get_dir,
        .direction_input = bcm_kona_gpio_direction_input,
        .get = bcm_kona_gpio_get,
        .direction_output = bcm_kona_gpio_direction_output,