github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 09:04:39 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

pinctrl: wpcm450: use new generic GPIO chip API

Browse Source 
Convert the driver to using the new generic GPIO chip interfaces from
linux/gpio/generic.h.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Link: https://lore.kernel.org/20250811-gpio-mmio-pinctrl-conv-v1-5-a84c5da2be20@linaro.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Bartosz Golaszewski 2025-08-11 17:02:04 +02:00 committed by Linus Walleij
parent 9e546aa9d5
commit 051f714167
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/pinctrl/nuvoton/pinctrl-wpcm450.c
View File

@ -11,6 +11,7 @@
#include <linux/device.h>
#include <linux/gpio/driver.h>
#include <linux/gpio/generic.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/mfd/syscon.h>
@ -47,7 +48,7 @@ struct wpcm450_pinctrl;
struct wpcm450_bank;
struct wpcm450_gpio {
struct gpio_chip gc;
struct gpio_generic_chip chip;
struct wpcm450_pinctrl *pctrl;
const struct wpcm450_bank *bank;
};
@ -184,11 +185,12 @@ static void wpcm450_gpio_irq_unmask(struct irq_data *d)
}
/*
* This is an implementation of the gpio_chip->get() function, for use in
* wpcm450_gpio_fix_evpol. Unfortunately, we can't use the bgpio-provided
* implementation there, because it would require taking gpio_chip->bgpio_lock,
* which is a spin lock, but wpcm450_gpio_fix_evpol must work in contexts where
* a raw spin lock is held.
* FIXME: This is an implementation of the gpio_chip->get() function, for use
* in wpcm450_gpio_fix_evpol(). It was implemented back when gpio-mmio used a
* regular spinlock internally, while wpcm450_gpio_fix_evpol() needed to work
* in contexts with a raw spinlock held. Since then, the gpio generic chip has
* been switched to using a raw spinlock so this should be converted to using
* the locking interfaces provided in linux/gpio/gneneric.h.
*/
static int wpcm450_gpio_get(struct wpcm450_gpio *gpio, int offset)
{
@ -329,7 +331,7 @@ static void wpcm450_gpio_irqhandler(struct irq_desc *desc)
for_each_set_bit(bit, &pending, 32) {
int offset = wpcm450_irq_bitnum_to_gpio(gpio, bit);
generic_handle_domain_irq(gpio->gc.irq.domain, offset);
generic_handle_domain_irq(gpio->chip.gc.irq.domain, offset);
}
chained_irq_exit(chip, desc);
}
@ -1012,7 +1014,7 @@ static int wpcm450_gpio_add_pin_ranges(struct gpio_chip *chip)
struct wpcm450_gpio *gpio = gpiochip_get_data(chip);
const struct wpcm450_bank *bank = gpio->bank;
return gpiochip_add_pin_range(&gpio->gc, dev_name(gpio->pctrl->dev),
return gpiochip_add_pin_range(&gpio->chip.gc, dev_name(gpio->pctrl->dev),
0, bank->base, bank->length);
}
@ -1029,6 +1031,7 @@ static int wpcm450_gpio_register(struct platform_device *pdev,
"Resource fail for GPIO controller\n");
for_each_gpiochip_node(dev, child) {
struct gpio_generic_chip_config config;
void __iomem *dat = NULL;
void __iomem *set = NULL;
void __iomem *dirout = NULL;
@ -1060,17 +1063,26 @@ static int wpcm450_gpio_register(struct platform_device *pdev,
} else {
flags = BGPIOF_NO_OUTPUT;
}
ret = bgpio_init(&gpio->gc, dev, 4,
dat, set, NULL, dirout, NULL, flags);
config = (typeof(config)){
.dev = dev,
.sz = 4,
.dat = dat,
.set = set,
.dirout = dirout,
.flags = flags,
};
ret = gpio_generic_chip_init(&gpio->chip, &config);
if (ret < 0)
return dev_err_probe(dev, ret, "GPIO initialization failed\n");
gpio->gc.ngpio = bank->length;
gpio->gc.set_config = wpcm450_gpio_set_config;
gpio->gc.fwnode = child;
gpio->gc.add_pin_ranges = wpcm450_gpio_add_pin_ranges;
gpio->chip.gc.ngpio = bank->length;
gpio->chip.gc.set_config = wpcm450_gpio_set_config;
gpio->chip.gc.fwnode = child;
gpio->chip.gc.add_pin_ranges = wpcm450_gpio_add_pin_ranges;
girq = &gpio->gc.irq;
girq = &gpio->chip.gc.irq;
gpio_irq_chip_set_chip(girq, &wpcm450_gpio_irqchip);
girq->parent_handler = wpcm450_gpio_irqhandler;
girq->parents = devm_kcalloc(dev, WPCM450_NUM_GPIO_IRQS,
@ -1094,7 +1106,7 @@ static int wpcm450_gpio_register(struct platform_device *pdev,
girq->num_parents++;
}
ret = devm_gpiochip_add_data(dev, &gpio->gc, gpio);
ret = devm_gpiochip_add_data(dev, &gpio->chip.gc, gpio);
if (ret)
return dev_err_probe(dev, ret, "Failed to add GPIO chip\n");
}