Commit 51ff9392 authored by Michael Walle's avatar Michael Walle Committed by Marc Zyngier
Browse files

pinctrl: ocelot: Make irq_chip immutable 



Since recently, the kernel is nagging about mutable irq_chips:

[    2.593426] gpio gpiochip0: (ocelot-gpio): not an immutable chip, please consider fixing it!

Make it const, flag it as IRQCHIP_IMMUTABLE, add the new helper
functions and call the appropriate gpiolib functions.

Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220706151553.1580790-2-michael@walle.cc
parent ef6e5d61

drivers/pinctrl/pinctrl-ocelot.c

+8 −2
Original line number Diff line number Diff line
@@ -1761,6 +1761,7 @@ static void ocelot_irq_mask(struct irq_data *data) 


	regmap_update_bits(info->map, REG(OCELOT_GPIO_INTR_ENA, info, gpio),

			   BIT(gpio % 32), 0);

	gpiochip_disable_irq(chip, gpio);

}



static void ocelot_irq_unmask(struct irq_data *data)
@@ -1769,6 +1770,7 @@ static void ocelot_irq_unmask(struct irq_data *data) 
	struct ocelot_pinctrl *info = gpiochip_get_data(chip);

	unsigned int gpio = irqd_to_hwirq(data);



	gpiochip_enable_irq(chip, gpio);

	regmap_update_bits(info->map, REG(OCELOT_GPIO_INTR_ENA, info, gpio),

			   BIT(gpio % 32), BIT(gpio % 32));

}
@@ -1790,8 +1792,10 @@ static struct irq_chip ocelot_eoi_irqchip = { 
	.irq_mask	= ocelot_irq_mask,

	.irq_eoi	= ocelot_irq_ack,

	.irq_unmask	= ocelot_irq_unmask,

	.flags          = IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED,

	.flags          = IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED |

			  IRQCHIP_IMMUTABLE,

	.irq_set_type	= ocelot_irq_set_type,

	GPIOCHIP_IRQ_RESOURCE_HELPERS

};



static struct irq_chip ocelot_irqchip = {
@@ -1800,6 +1804,8 @@ static struct irq_chip ocelot_irqchip = { 
	.irq_ack	= ocelot_irq_ack,

	.irq_unmask	= ocelot_irq_unmask,

	.irq_set_type	= ocelot_irq_set_type,

	.flags          = IRQCHIP_IMMUTABLE,

	GPIOCHIP_IRQ_RESOURCE_HELPERS

};



static int ocelot_irq_set_type(struct irq_data *data, unsigned int type)
@@ -1863,7 +1869,7 @@ static int ocelot_gpiochip_register(struct platform_device *pdev, 
	irq = platform_get_irq_optional(pdev, 0);

	if (irq > 0) {

		girq = &gc->irq;

		girq->chip = &ocelot_irqchip;

		gpio_irq_chip_set_chip(girq, &ocelot_irqchip);

		girq->parent_handler = ocelot_irq_handler;

		girq->num_parents = 1;

		girq->parents = devm_kcalloc(&pdev->dev, 1,