diff options
| author | Horatiu Vultur <horatiu.vultur@microchip.com> | 2022-03-04 15:44:32 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-08 13:58:29 +0200 |
| commit | e5314f4cf2753179dafb2c247f3d373d50d58072 (patch) | |
| tree | c2013090cbeb8d1f4a67740dadfe9be7dcb724da /drivers/pinctrl | |
| parent | afd43a88066d9f14ccdd14b47736d2e9ec11ec61 (diff) | |
| download | linux-stable-e5314f4cf2753179dafb2c247f3d373d50d58072.tar.gz linux-stable-e5314f4cf2753179dafb2c247f3d373d50d58072.tar.bz2 linux-stable-e5314f4cf2753179dafb2c247f3d373d50d58072.zip | |
pinctrl: ocelot: Fix interrupt parsing
[ Upstream commit d1f2c82f3b1f428bdc0933dde52fb93ae796d4ee ]
In the blamed commit, it removes the duplicate of_node assignment in the
driver. But the driver uses this before calling into of_gpio_dev_init to
determine if it needs to assign an IRQ chip to the GPIO. The fixes
consists in using the platform_get_irq_optional
Fixes: 8a8d6bbe1d3bc7 ("pinctrl: Get rid of duplicate of_node assignment in the drivers")
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Link: https://lore.kernel.org/r/20220304144432.3397621-3-horatiu.vultur@microchip.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/pinctrl-ocelot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c index 9c13a7c90fc3..370459243007 100644 --- a/drivers/pinctrl/pinctrl-ocelot.c +++ b/drivers/pinctrl/pinctrl-ocelot.c @@ -1750,8 +1750,8 @@ static int ocelot_gpiochip_register(struct platform_device *pdev, gc->base = -1; gc->label = "ocelot-gpio"; - irq = irq_of_parse_and_map(gc->of_node, 0); - if (irq) { + irq = platform_get_irq_optional(pdev, 0); + if (irq > 0) { girq = &gc->irq; girq->chip = &ocelot_irqchip; girq->parent_handler = ocelot_irq_handler; |