Skip to content

Commit

Permalink
pinctrl: axp209: add programmable gpio_status_offset
Browse files Browse the repository at this point in the history
To prepare for patches that will add support for a new PMIC that has a
different GPIO input status register, add a gpio_status_offset within
axp20x_pctl structure and use it.

Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Quentin Schulz authored and Linus Walleij committed Dec 7, 2017
1 parent d242e60 commit 48e706f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/pinctrl/pinctrl-axp209.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ struct axp20x_pctrl_desc {
u8 ldo_mask;
/* Stores the pins supporting ADC function. Bit offset is pin number. */
u8 adc_mask;
u8 gpio_status_offset;
};

struct axp20x_pinctrl_function {
Expand Down Expand Up @@ -77,6 +78,7 @@ static const struct axp20x_pctrl_desc axp20x_data = {
.npins = ARRAY_SIZE(axp209_pins),
.ldo_mask = BIT(0) | BIT(1),
.adc_mask = BIT(0) | BIT(1),
.gpio_status_offset = 4,
};

static int axp20x_gpio_get_reg(unsigned int offset)
Expand Down Expand Up @@ -108,7 +110,7 @@ static int axp20x_gpio_get(struct gpio_chip *chip, unsigned int offset)
if (ret)
return ret;

return !!(val & BIT(offset + 4));
return !!(val & BIT(offset + pctl->desc->gpio_status_offset));
}

static int axp20x_gpio_get_direction(struct gpio_chip *chip,
Expand Down

0 comments on commit 48e706f

Please sign in to comment.