gpio: clps711x: use new generic GPIO chip API
Convert the driver to using the new generic GPIO chip interfaces from linux/gpio/generic.h. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20250702-gpio-mmio-rework-v2-4-6b77aab684d8@linaro.org Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>pull/1309/head
parent
1f129b15c2
commit
fd0f0d1a1e
|
|
@ -8,13 +8,15 @@
|
|||
#include <linux/err.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/gpio/driver.h>
|
||||
#include <linux/gpio/generic.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
static int clps711x_gpio_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct gpio_generic_chip_config config = { };
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
struct gpio_generic_chip *gen_gc;
|
||||
void __iomem *dat, *dir;
|
||||
struct gpio_chip *gc;
|
||||
int err, id;
|
||||
|
||||
if (!np)
|
||||
|
|
@ -24,8 +26,8 @@ static int clps711x_gpio_probe(struct platform_device *pdev)
|
|||
if ((id < 0) || (id > 4))
|
||||
return -ENODEV;
|
||||
|
||||
gc = devm_kzalloc(&pdev->dev, sizeof(*gc), GFP_KERNEL);
|
||||
if (!gc)
|
||||
gen_gc = devm_kzalloc(&pdev->dev, sizeof(*gen_gc), GFP_KERNEL);
|
||||
if (!gen_gc)
|
||||
return -ENOMEM;
|
||||
|
||||
dat = devm_platform_ioremap_resource(pdev, 0);
|
||||
|
|
@ -36,34 +38,37 @@ static int clps711x_gpio_probe(struct platform_device *pdev)
|
|||
if (IS_ERR(dir))
|
||||
return PTR_ERR(dir);
|
||||
|
||||
config.dev = &pdev->dev;
|
||||
config.sz = 1;
|
||||
config.dat = dat;
|
||||
|
||||
switch (id) {
|
||||
case 3:
|
||||
/* PORTD is inverted logic for direction register */
|
||||
err = bgpio_init(gc, &pdev->dev, 1, dat, NULL, NULL,
|
||||
NULL, dir, 0);
|
||||
config.dirin = dir;
|
||||
break;
|
||||
default:
|
||||
err = bgpio_init(gc, &pdev->dev, 1, dat, NULL, NULL,
|
||||
dir, NULL, 0);
|
||||
config.dirout = dir;
|
||||
break;
|
||||
}
|
||||
|
||||
err = gpio_generic_chip_init(gen_gc, &config);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
switch (id) {
|
||||
case 4:
|
||||
/* PORTE is 3 lines only */
|
||||
gc->ngpio = 3;
|
||||
gen_gc->gc.ngpio = 3;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
gc->base = -1;
|
||||
gc->owner = THIS_MODULE;
|
||||
gen_gc->gc.base = -1;
|
||||
gen_gc->gc.owner = THIS_MODULE;
|
||||
|
||||
return devm_gpiochip_add_data(&pdev->dev, gc, NULL);
|
||||
return devm_gpiochip_add_data(&pdev->dev, &gen_gc->gc, NULL);
|
||||
}
|
||||
|
||||
static const struct of_device_id clps711x_gpio_ids[] = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue