Commit fff086eb authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

gpio: mlxbf: use new generic GPIO chip API



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

Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20250903-gpio-mmio-gpio-conv-part3-v1-8-ff346509f408@linaro.org


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 8bbe11bb
Loading
Loading
Loading
Loading
+15 −10
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@
#include <linux/bitops.h>
#include <linux/device.h>
#include <linux/gpio/driver.h>
#include <linux/gpio/generic.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@ -37,7 +38,7 @@ struct mlxbf_gpio_context_save_regs {

/* Device state structure. */
struct mlxbf_gpio_state {
	struct gpio_chip gc;
	struct gpio_generic_chip chip;

	/* Memory Address */
	void __iomem *base;
@@ -49,6 +50,7 @@ struct mlxbf_gpio_state {

static int mlxbf_gpio_probe(struct platform_device *pdev)
{
	struct gpio_generic_chip_config config;
	struct mlxbf_gpio_state *gs;
	struct device *dev = &pdev->dev;
	struct gpio_chip *gc;
@@ -62,21 +64,24 @@ static int mlxbf_gpio_probe(struct platform_device *pdev)
	if (IS_ERR(gs->base))
		return PTR_ERR(gs->base);

	gc = &gs->gc;
	ret = bgpio_init(gc, dev, 8,
			 gs->base + MLXBF_GPIO_PIN_STATE,
			 NULL,
			 NULL,
			 gs->base + MLXBF_GPIO_PIN_DIR_O,
			 gs->base + MLXBF_GPIO_PIN_DIR_I,
			 0);
	gc = &gs->chip.gc;

	config = (typeof(config)){
		.dev = dev,
		.sz = 8,
		.dat = gs->base + MLXBF_GPIO_PIN_STATE,
		.dirout = gs->base + MLXBF_GPIO_PIN_DIR_O,
		.dirin =  gs->base + MLXBF_GPIO_PIN_DIR_I,
	};

	ret = gpio_generic_chip_init(&gs->chip, &config);
	if (ret)
		return -ENODEV;

	gc->owner = THIS_MODULE;
	gc->ngpio = MLXBF_GPIO_NR;

	ret = devm_gpiochip_add_data(dev, &gs->gc, gs);
	ret = devm_gpiochip_add_data(dev, &gs->chip.gc, gs);
	if (ret) {
		dev_err(&pdev->dev, "Failed adding memory mapped gpiochip\n");
		return ret;