diff mbox series

[PATCHv2] gpio: MT7621: use a per instance irq_chip structure

Message ID 20190130161048.9852-1-opensource@vdorst.com (mailing list archive)
State New, archived
Headers show
Series [PATCHv2] gpio: MT7621: use a per instance irq_chip structure | expand

Commit Message

René van Dorst Jan. 30, 2019, 4:10 p.m. UTC 
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")
Signed-off-by: René van Dorst <opensource@vdorst.com>
Cc: linux-gpio@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org
Cc: gerg@kernel.org
Cc: stable@vger.kernel.org
---
 drivers/gpio/gpio-mt7621.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

v2: Remove an empty line
    Add Cc stable

Comments

Greg Ungerer Jan. 31, 2019, 12:55 a.m. UTC | #1 
Hi René,

On 31/1/19 2:10 am, René van Dorst wrote:
> 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")
> Signed-off-by: René van Dorst <opensource@vdorst.com>
> Cc: linux-gpio@vger.kernel.org
> Cc: linux-mediatek@lists.infradead.org
> Cc: gerg@kernel.org
> Cc: stable@vger.kernel.org

Works great on my MT7621 hardware.

Tested-by: Greg Ungerer <gerg@kernel.org>

Regards
Greg


> ---
>   drivers/gpio/gpio-mt7621.c | 20 ++++++++++----------
>   1 file changed, 10 insertions(+), 10 deletions(-)
> 
> v2: Remove an empty line
>      Add Cc stable
> 
> diff --git a/drivers/gpio/gpio-mt7621.c b/drivers/gpio/gpio-mt7621.c
> index 00e954f22bc9..74401e0adb29 100644
> --- a/drivers/gpio/gpio-mt7621.c
> +++ b/drivers/gpio/gpio-mt7621.c
> @@ -30,6 +30,7 @@
>   #define GPIO_REG_EDGE		0xA0
>   
>   struct mtk_gc {
> +	struct irq_chip irq_chip;
>   	struct gpio_chip chip;
>   	spinlock_t lock;
>   	int bank;
> @@ -189,13 +190,6 @@ mediatek_gpio_irq_type(struct irq_data *d, unsigned int type)
>   	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
>   mediatek_gpio_xlate(struct gpio_chip *chip,
>   		    const struct of_phandle_args *spec, u32 *flags)
> @@ -254,6 +248,13 @@ mediatek_gpio_bank_probe(struct device *dev,
>   		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) {
>   		/*
>   		 * Manually request the irq here instead of passing
> @@ -270,14 +271,14 @@ mediatek_gpio_bank_probe(struct device *dev,
>   			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);
>   		if (ret) {
>   			dev_err(dev, "failed to add gpiochip_irqchip\n");
>   			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);
>   	}
>   
> @@ -310,7 +311,6 @@ mediatek_gpio_probe(struct platform_device *pdev)
>   	mtk->gpio_irq = irq_of_parse_and_map(np, 0);
>   	mtk->dev = dev;
>   	platform_set_drvdata(pdev, mtk);
> -	mediatek_gpio_irq_chip.name = dev_name(dev);
>   
>   	for (i = 0; i < MTK_BANK_CNT; i++) {
>   		ret = mediatek_gpio_bank_probe(dev, np, i);
>
Linus Walleij Feb. 8, 2019, 11:30 a.m. UTC | #2 
On Wed, Jan 30, 2019 at 5:21 PM René van Dorst <opensource@vdorst.com> wrote:

> 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")
> Signed-off-by: René van Dorst <opensource@vdorst.com>
> Cc: linux-gpio@vger.kernel.org
> Cc: linux-mediatek@lists.infradead.org
> Cc: gerg@kernel.org
> Cc: stable@vger.kernel.org

Patch applied for fixes with Greg's ACK.

Yours,
Linus Walleij
diff mbox series

Patch

diff --git a/drivers/gpio/gpio-mt7621.c b/drivers/gpio/gpio-mt7621.c
index 00e954f22bc9..74401e0adb29 100644
--- a/drivers/gpio/gpio-mt7621.c
+++ b/drivers/gpio/gpio-mt7621.c
@@ -30,6 +30,7 @@ 
 #define GPIO_REG_EDGE		0xA0
 
 struct mtk_gc {
+	struct irq_chip irq_chip;
 	struct gpio_chip chip;
 	spinlock_t lock;
 	int bank;
@@ -189,13 +190,6 @@  mediatek_gpio_irq_type(struct irq_data *d, unsigned int type)
 	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
 mediatek_gpio_xlate(struct gpio_chip *chip,
 		    const struct of_phandle_args *spec, u32 *flags)
@@ -254,6 +248,13 @@  mediatek_gpio_bank_probe(struct device *dev,
 		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) {
 		/*
 		 * Manually request the irq here instead of passing
@@ -270,14 +271,14 @@  mediatek_gpio_bank_probe(struct device *dev,
 			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);
 		if (ret) {
 			dev_err(dev, "failed to add gpiochip_irqchip\n");
 			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);
 	}
 
@@ -310,7 +311,6 @@  mediatek_gpio_probe(struct platform_device *pdev)
 	mtk->gpio_irq = irq_of_parse_and_map(np, 0);
 	mtk->dev = dev;
 	platform_set_drvdata(pdev, mtk);
-	mediatek_gpio_irq_chip.name = dev_name(dev);
 
 	for (i = 0; i < MTK_BANK_CNT; i++) {
 		ret = mediatek_gpio_bank_probe(dev, np, i);