Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

gpio: MT7621: use a per instance irq_chip structure

This fixes the kernel complains:
gpio gpiochip1: (1e000600.gpio-bank1): detected irqchip that is shared
with multiple gpiochips: please fix the driver.
gpio gpiochip2: (1e000600.gpio-bank2): detected irqchip that is shared
with multiple gpiochips: please fix the driver.

Fixes: 4ba9c3afda41 ("gpio: mt7621: Add a driver for MT7621")
Cc: stable@vger.kernel.org
Signed-off-by: René van Dorst <opensource@vdorst.com>
Cc: linux-gpio@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org
Tested-by: Greg Ungerer <gerg@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

René van Dorst and committed by
Linus Walleij
fa84667b 8834f560

+10 -10
+10 -10
drivers/gpio/gpio-mt7621.c
··· 30 30 #define GPIO_REG_EDGE 0xA0 31 31 32 32 struct mtk_gc { 33 + struct irq_chip irq_chip; 33 34 struct gpio_chip chip; 34 35 spinlock_t lock; 35 36 int bank; ··· 190 189 return 0; 191 190 } 192 191 193 - static struct irq_chip mediatek_gpio_irq_chip = { 194 - .irq_unmask = mediatek_gpio_irq_unmask, 195 - .irq_mask = mediatek_gpio_irq_mask, 196 - .irq_mask_ack = mediatek_gpio_irq_mask, 197 - .irq_set_type = mediatek_gpio_irq_type, 198 - }; 199 - 200 192 static int 201 193 mediatek_gpio_xlate(struct gpio_chip *chip, 202 194 const struct of_phandle_args *spec, u32 *flags) ··· 248 254 return ret; 249 255 } 250 256 257 + rg->irq_chip.name = dev_name(dev); 258 + rg->irq_chip.parent_device = dev; 259 + rg->irq_chip.irq_unmask = mediatek_gpio_irq_unmask; 260 + rg->irq_chip.irq_mask = mediatek_gpio_irq_mask; 261 + rg->irq_chip.irq_mask_ack = mediatek_gpio_irq_mask; 262 + rg->irq_chip.irq_set_type = mediatek_gpio_irq_type; 263 + 251 264 if (mtk->gpio_irq) { 252 265 /* 253 266 * Manually request the irq here instead of passing ··· 271 270 return ret; 272 271 } 273 272 274 - ret = gpiochip_irqchip_add(&rg->chip, &mediatek_gpio_irq_chip, 273 + ret = gpiochip_irqchip_add(&rg->chip, &rg->irq_chip, 275 274 0, handle_simple_irq, IRQ_TYPE_NONE); 276 275 if (ret) { 277 276 dev_err(dev, "failed to add gpiochip_irqchip\n"); 278 277 return ret; 279 278 } 280 279 281 - gpiochip_set_chained_irqchip(&rg->chip, &mediatek_gpio_irq_chip, 280 + gpiochip_set_chained_irqchip(&rg->chip, &rg->irq_chip, 282 281 mtk->gpio_irq, NULL); 283 282 } 284 283 ··· 311 310 mtk->gpio_irq = irq_of_parse_and_map(np, 0); 312 311 mtk->dev = dev; 313 312 platform_set_drvdata(pdev, mtk); 314 - mediatek_gpio_irq_chip.name = dev_name(dev); 315 313 316 314 for (i = 0; i < MTK_BANK_CNT; i++) { 317 315 ret = mediatek_gpio_bank_probe(dev, np, i);