Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c828c265 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v5.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fixes from Linus Walleij:
 "Two GPIO fixes for the v5.0 series:

   - Per-instance irqchip on the MT7621

   - Avoid direction setting using pin control on MMP2"

* tag 'gpio-v5.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: pxa: avoid attempting to set pin direction via pinctrl on MMP2
  gpio: MT7621: use a per instance irq_chip structure
parents 7d9d592c af14b2c9

drivers/gpio/gpio-mt7621.c

+10 −10
Original line number Diff line number Diff line
@@ -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);

drivers/gpio/gpio-pxa.c

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ static bool pxa_gpio_has_pinctrl(void) 
{

	switch (gpio_type) {

	case PXA3XX_GPIO:

	case MMP2_GPIO:

		return false;



	default: