Skip to content

Commit

Permalink
pinctrl: rza2: Drop driver use of consumer flags
Browse files Browse the repository at this point in the history
These flags are for consumers of GPIO lines, not for
drivers.

Cc: Chris Brandt <chris.brandt@renesas.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
  • Loading branch information
Linus Walleij authored and Geert Uytterhoeven committed Aug 23, 2019
1 parent ab6366e commit 5b1d96e
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/pinctrl/pinctrl-rza2.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static void rza2_pin_to_gpio(void __iomem *pfc_base, unsigned int offset,
mask16 = RZA2_PDR_MASK << (pin * 2);
reg16 &= ~mask16;

if (dir == GPIOF_DIR_IN)
if (dir)
reg16 |= RZA2_PDR_INPUT << (pin * 2); /* pin as input */
else
reg16 |= RZA2_PDR_OUTPUT << (pin * 2); /* pin as output */
Expand All @@ -134,26 +134,26 @@ static int rza2_chip_get_direction(struct gpio_chip *chip, unsigned int offset)
reg16 = (reg16 >> (pin * 2)) & RZA2_PDR_MASK;

if (reg16 == RZA2_PDR_OUTPUT)
return GPIOF_DIR_OUT;
return 0;

if (reg16 == RZA2_PDR_INPUT)
return GPIOF_DIR_IN;
return 1;

/*
* This GPIO controller has a default Hi-Z state that is not input or
* output, so force the pin to input now.
*/
rza2_pin_to_gpio(priv->base, offset, GPIOF_DIR_IN);
rza2_pin_to_gpio(priv->base, offset, 1);

return GPIOF_DIR_IN;
return 1;
}

static int rza2_chip_direction_input(struct gpio_chip *chip,
unsigned int offset)
{
struct rza2_pinctrl_priv *priv = gpiochip_get_data(chip);

rza2_pin_to_gpio(priv->base, offset, GPIOF_DIR_IN);
rza2_pin_to_gpio(priv->base, offset, 1);

return 0;
}
Expand Down Expand Up @@ -191,7 +191,7 @@ static int rza2_chip_direction_output(struct gpio_chip *chip,
struct rza2_pinctrl_priv *priv = gpiochip_get_data(chip);

rza2_chip_set(chip, offset, val);
rza2_pin_to_gpio(priv->base, offset, GPIOF_DIR_OUT);
rza2_pin_to_gpio(priv->base, offset, 0);

return 0;
}
Expand Down

0 comments on commit 5b1d96e

Please sign in to comment.