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

gpio: idt3243x: 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-3-ff346509f408@linaro.org


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent bd9bfafa

drivers/gpio/gpio-idt3243x.c

+23 −22
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/bitops.h>

#include <linux/gpio/driver.h>

#include <linux/gpio/generic.h>

#include <linux/irq.h>

#include <linux/module.h>

#include <linux/mod_devicetable.h>
@@ -18,7 +19,7 @@ 
#define IDT_GPIO_ISTAT		0x0C



struct idt_gpio_ctrl {

	struct gpio_chip gc;

	struct gpio_generic_chip chip;

	void __iomem *pic;

	void __iomem *gpio;

	u32 mask_cache;
@@ -50,14 +51,13 @@ static int idt_gpio_irq_set_type(struct irq_data *d, unsigned int flow_type) 
	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct idt_gpio_ctrl *ctrl = gpiochip_get_data(gc);

	unsigned int sense = flow_type & IRQ_TYPE_SENSE_MASK;

	unsigned long flags;

	u32 ilevel;



	/* hardware only supports level triggered */

	if (sense == IRQ_TYPE_NONE || (sense & IRQ_TYPE_EDGE_BOTH))

		return -EINVAL;



	raw_spin_lock_irqsave(&gc->bgpio_lock, flags);

	guard(gpio_generic_lock_irqsave)(&ctrl->chip);



	ilevel = readl(ctrl->gpio + IDT_GPIO_ILEVEL);

	if (sense & IRQ_TYPE_LEVEL_HIGH)
@@ -68,7 +68,6 @@ static int idt_gpio_irq_set_type(struct irq_data *d, unsigned int flow_type) 
	writel(ilevel, ctrl->gpio + IDT_GPIO_ILEVEL);

	irq_set_handler_locked(d, handle_level_irq);



	raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags);

	return 0;

}
@@ -84,14 +83,11 @@ static void idt_gpio_mask(struct irq_data *d) 
{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct idt_gpio_ctrl *ctrl = gpiochip_get_data(gc);

	unsigned long flags;



	raw_spin_lock_irqsave(&gc->bgpio_lock, flags);



	scoped_guard(gpio_generic_lock_irqsave, &ctrl->chip) {

		ctrl->mask_cache |= BIT(d->hwirq);

		writel(ctrl->mask_cache, ctrl->pic + IDT_PIC_IRQ_MASK);



	raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags);

	}



	gpiochip_disable_irq(gc, irqd_to_hwirq(d));

}
@@ -100,15 +96,13 @@ static void idt_gpio_unmask(struct irq_data *d) 
{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct idt_gpio_ctrl *ctrl = gpiochip_get_data(gc);

	unsigned long flags;



	gpiochip_enable_irq(gc, irqd_to_hwirq(d));

	raw_spin_lock_irqsave(&gc->bgpio_lock, flags);



	guard(gpio_generic_lock_irqsave)(&ctrl->chip);



	ctrl->mask_cache &= ~BIT(d->hwirq);

	writel(ctrl->mask_cache, ctrl->pic + IDT_PIC_IRQ_MASK);



	raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags);

}



static int idt_gpio_irq_init_hw(struct gpio_chip *gc)
@@ -134,6 +128,7 @@ static const struct irq_chip idt_gpio_irqchip = { 


static int idt_gpio_probe(struct platform_device *pdev)

{

	struct gpio_generic_chip_config config;

	struct device *dev = &pdev->dev;

	struct gpio_irq_chip *girq;

	struct idt_gpio_ctrl *ctrl;
@@ -150,18 +145,24 @@ static int idt_gpio_probe(struct platform_device *pdev) 
	if (IS_ERR(ctrl->gpio))

		return PTR_ERR(ctrl->gpio);



	ctrl->gc.parent = dev;

	ctrl->chip.gc.parent = dev;



	config = (typeof(config)){

		.dev = &pdev->dev,

		.sz = 4,

		.dat = ctrl->gpio + IDT_GPIO_DATA,

		.dirout = ctrl->gpio + IDT_GPIO_DIR,

	};



	ret = bgpio_init(&ctrl->gc, &pdev->dev, 4, ctrl->gpio + IDT_GPIO_DATA,

			 NULL, NULL, ctrl->gpio + IDT_GPIO_DIR, NULL, 0);

	ret = gpio_generic_chip_init(&ctrl->chip, &config);

	if (ret) {

		dev_err(dev, "bgpio_init failed\n");

		dev_err(dev, "failed to initialize the generic GPIO chip\n");

		return ret;

	}



	ret = device_property_read_u32(dev, "ngpios", &ngpios);

	if (!ret)

		ctrl->gc.ngpio = ngpios;

		ctrl->chip.gc.ngpio = ngpios;



	if (device_property_read_bool(dev, "interrupt-controller")) {

		ctrl->pic = devm_platform_ioremap_resource_byname(pdev, "pic");
@@ -172,7 +173,7 @@ static int idt_gpio_probe(struct platform_device *pdev) 
		if (parent_irq < 0)

			return parent_irq;



		girq = &ctrl->gc.irq;

		girq = &ctrl->chip.gc.irq;

		gpio_irq_chip_set_chip(girq, &idt_gpio_irqchip);

		girq->init_hw = idt_gpio_irq_init_hw;

		girq->parent_handler = idt_gpio_dispatch;
@@ -188,7 +189,7 @@ static int idt_gpio_probe(struct platform_device *pdev) 
		girq->handler = handle_bad_irq;

	}



	return devm_gpiochip_add_data(&pdev->dev, &ctrl->gc, ctrl);

	return devm_gpiochip_add_data(&pdev->dev, &ctrl->chip.gc, ctrl);

}



static const struct of_device_id idt_gpio_of_match[] = {