[PATCH v1 07/17] pinctrl: cy8c95x0: Enable GPIO range

Andy Shevchenko
2022-09-02T18:34:54Z

Since it's a pin control, GPIO counterpart needs to know the mapping
between pin numbering and GPIO numbering. Enable this by calling
gpiochip_add_pin_range() at the chip addition time.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/pinctrl/pinctrl-cy8c95x0.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-cy8c95x0.c b/drivers/pinctrl/pinctrl-cy8c95x0.c
index eac8b073e19f..f09311d2d3fa 100644
--- a/drivers/pinctrl/pinctrl-cy8c95x0.c
+++ b/drivers/pinctrl/pinctrl-cy8c95x0.c
@@ -801,7 +801,20 @@ static void cy8c95x0_gpio_set_multiple(struct gpio_chip *gc,
cy8c95x0_write_regs_mask(chip, CY8C95X0_OUTPUT, bits, mask);
}

-static int cy8c95x0_setup_gpiochip(struct cy8c95x0_pinctrl *chip, int ngpio)
+static int cy8c95x0_add_pin_ranges(struct gpio_chip *gc)
+{
+ struct cy8c95x0_pinctrl *chip = gpiochip_get_data(gc);
+ struct device *dev = chip->dev;
+ int ret;
+
+ ret = gpiochip_add_pin_range(gc, dev_name(dev), 0, 0, chip->tpin);
+ if (ret)
+ dev_err(dev, "failed to add GPIO pin range\n");
+
+ return ret;
+}
+
+static int cy8c95x0_setup_gpiochip(struct cy8c95x0_pinctrl *chip)
{
struct gpio_chip *gc = &chip->gpio_chip;

@@ -814,9 +827,10 @@ static int cy8c95x0_setup_gpiochip(struct cy8c95x0_pinctrl *chip, int ngpio)
gc->set_multiple = cy8c95x0_gpio_set_multiple;
gc->set_config = cy8c95x0_gpio_set_config;
gc->can_sleep = true;
+ gc->add_pin_ranges = cy8c95x0_add_pin_ranges;

gc->base = -1;
- gc->ngpio = ngpio;
+ gc->ngpio = chip->tpin;

gc->parent = chip->dev;
gc->owner = THIS_MODULE;
@@ -1328,11 +1342,11 @@ static int cy8c95x0_probe(struct i2c_client *client)
goto err_exit;
}

- ret = cy8c95x0_setup_gpiochip(chip, chip->tpin);
+ ret = cy8c95x0_setup_pinctrl(chip);
if (ret)
goto err_exit;

- ret = cy8c95x0_setup_pinctrl(chip);
+ ret = cy8c95x0_setup_gpiochip(chip);
if (ret)
goto err_exit;

--
2.35.1