| Message ID | 20220621034224.38995-4-samuel@sholland.org |
|---|---|
| State | Accepted |
| Commit | d4c0b614b5a47d0b3870e89fd211b6e80f6973eb |
| Headers | show |
| Series | AXP221/AXP223/AXP809 GPIO support | expand |
On Tue, Jun 21, 2022 at 11:42 AM Samuel Holland <samuel@sholland.org> wrote: > > These PMICs each have 2 GPIOs with the same register layout as AXP813, > but without an ADC function. They all fall back to the AXP221 compatible > string, so only that one needs to be listed in the driver. > > Signed-off-by: Samuel Holland <samuel@sholland.org> Reviewed-by: Chen-Yu Tsai <wens@csie.org>
On Tue, Jun 21, 2022 at 5:42 AM Samuel Holland <samuel@sholland.org> wrote: > These PMICs each have 2 GPIOs with the same register layout as AXP813, > but without an ADC function. They all fall back to the AXP221 compatible > string, so only that one needs to be listed in the driver. > > Signed-off-by: Samuel Holland <samuel@sholland.org> Patch applied to the pinctrl tree! Yours, Linus Walleij
diff --git a/drivers/pinctrl/pinctrl-axp209.c b/drivers/pinctrl/pinctrl-axp209.c index 207cbae3a7bf..7ab20ac15391 100644 --- a/drivers/pinctrl/pinctrl-axp209.c +++ b/drivers/pinctrl/pinctrl-axp209.c @@ -73,7 +73,7 @@ static const struct pinctrl_pin_desc axp209_pins[] = { PINCTRL_PIN(2, "GPIO2"), }; -static const struct pinctrl_pin_desc axp813_pins[] = { +static const struct pinctrl_pin_desc axp22x_pins[] = { PINCTRL_PIN(0, "GPIO0"), PINCTRL_PIN(1, "GPIO1"), }; @@ -87,9 +87,16 @@ static const struct axp20x_pctrl_desc axp20x_data = { .adc_mux = AXP20X_MUX_ADC, }; +static const struct axp20x_pctrl_desc axp22x_data = { + .pins = axp22x_pins, + .npins = ARRAY_SIZE(axp22x_pins), + .ldo_mask = BIT(0) | BIT(1), + .gpio_status_offset = 0, +}; + static const struct axp20x_pctrl_desc axp813_data = { - .pins = axp813_pins, - .npins = ARRAY_SIZE(axp813_pins), + .pins = axp22x_pins, + .npins = ARRAY_SIZE(axp22x_pins), .ldo_mask = BIT(0) | BIT(1), .adc_mask = BIT(0), .gpio_status_offset = 0, @@ -388,6 +395,7 @@ static int axp20x_build_funcs_groups(struct platform_device *pdev) static const struct of_device_id axp20x_pctl_match[] = { { .compatible = "x-powers,axp209-gpio", .data = &axp20x_data, }, + { .compatible = "x-powers,axp221-gpio", .data = &axp22x_data, }, { .compatible = "x-powers,axp813-gpio", .data = &axp813_data, }, { } };
These PMICs each have 2 GPIOs with the same register layout as AXP813, but without an ADC function. They all fall back to the AXP221 compatible string, so only that one needs to be listed in the driver. Signed-off-by: Samuel Holland <samuel@sholland.org> --- (no changes since v1) drivers/pinctrl/pinctrl-axp209.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)