Commit fa84667b authored by René van Dorst's avatar René van Dorst Committed by Linus Walleij
Browse files

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: 4ba9c3af ("gpio: mt7621: Add a driver for MT7621")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRené van Dorst <opensource@vdorst.com>
Cc: linux-gpio@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org
Tested-by: default avatarGreg Ungerer <gerg@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8834f560

drivers/gpio/gpio-mt7621.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
#define GPIO_REG_EDGE		0xA0

#define GPIO_REG_EDGE		0xA0





struct mtk_gc {

struct mtk_gc {

	struct irq_chip irq_chip;

	struct gpio_chip chip;

	struct gpio_chip chip;

	spinlock_t lock;

	spinlock_t lock;

	int bank;

	int bank;
@@ -189,13 +190,6 @@ mediatek_gpio_irq_type(struct irq_data *d, unsigned int type) 
	return 0;

	return 0;

}

}





static struct irq_chip mediatek_gpio_irq_chip = {

	.irq_unmask		= mediatek_gpio_irq_unmask,

	.irq_mask		= mediatek_gpio_irq_mask,

	.irq_mask_ack		= mediatek_gpio_irq_mask,

	.irq_set_type		= mediatek_gpio_irq_type,

};



static int

static int

mediatek_gpio_xlate(struct gpio_chip *chip,

mediatek_gpio_xlate(struct gpio_chip *chip,

		    const struct of_phandle_args *spec, u32 *flags)

		    const struct of_phandle_args *spec, u32 *flags)
@@ -254,6 +248,13 @@ mediatek_gpio_bank_probe(struct device *dev, 
		return ret;

		return ret;

	}

	}





	rg->irq_chip.name = dev_name(dev);

	rg->irq_chip.parent_device = dev;

	rg->irq_chip.irq_unmask = mediatek_gpio_irq_unmask;

	rg->irq_chip.irq_mask = mediatek_gpio_irq_mask;

	rg->irq_chip.irq_mask_ack = mediatek_gpio_irq_mask;

	rg->irq_chip.irq_set_type = mediatek_gpio_irq_type;



	if (mtk->gpio_irq) {

	if (mtk->gpio_irq) {

		/*

		/*

		 * Manually request the irq here instead of passing

		 * Manually request the irq here instead of passing
@@ -270,14 +271,14 @@ mediatek_gpio_bank_probe(struct device *dev, 
			return ret;

			return ret;

		}

		}





		ret = gpiochip_irqchip_add(&rg->chip, &mediatek_gpio_irq_chip,

		ret = gpiochip_irqchip_add(&rg->chip, &rg->irq_chip,

					   0, handle_simple_irq, IRQ_TYPE_NONE);

					   0, handle_simple_irq, IRQ_TYPE_NONE);

		if (ret) {

		if (ret) {

			dev_err(dev, "failed to add gpiochip_irqchip\n");

			dev_err(dev, "failed to add gpiochip_irqchip\n");

			return ret;

			return ret;

		}

		}





		gpiochip_set_chained_irqchip(&rg->chip, &mediatek_gpio_irq_chip,

		gpiochip_set_chained_irqchip(&rg->chip, &rg->irq_chip,

					     mtk->gpio_irq, NULL);

					     mtk->gpio_irq, NULL);

	}

	}
@@ -310,7 +311,6 @@ mediatek_gpio_probe(struct platform_device *pdev) 
	mtk->gpio_irq = irq_of_parse_and_map(np, 0);

	mtk->gpio_irq = irq_of_parse_and_map(np, 0);

	mtk->dev = dev;

	mtk->dev = dev;

	platform_set_drvdata(pdev, mtk);

	platform_set_drvdata(pdev, mtk);

	mediatek_gpio_irq_chip.name = dev_name(dev);





	for (i = 0; i < MTK_BANK_CNT; i++) {

	for (i = 0; i < MTK_BANK_CNT; i++) {

		ret = mediatek_gpio_bank_probe(dev, np, i);

		ret = mediatek_gpio_bank_probe(dev, np, i);

CRA Git | Maintained and supported by SUSTech CRA and CCSE