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

Commit 7111fa11 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull GPIO fixes from Linus Walleij:
 "More GPIO fixes! We found a late regression in the Intel Merrifield
  driver. Oh well. We fixed it up.

   - Fix a build error in the tools used for kselftest

   - A series of reverts to bring the Intel Merrifield back to working.

  We will likely unrevert the reverts for v5.5 but we can't have v5.4
  broken"

* tag 'gpio-v5.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  Revert "gpio: merrifield: Pass irqchip when adding gpiochip"
  Revert "gpio: merrifield: Restore use of irq_base"
  Revert "gpio: merrifield: Move hardware initialization to callback"
  tools: gpio: Use !building_out_of_srctree to determine srctree
parents a99d8080 1173c3c2

drivers/gpio/gpio-merrifield.c

+13 −20
Original line number Diff line number Diff line
@@ -362,9 +362,8 @@ static void mrfld_irq_handler(struct irq_desc *desc) 
	chained_irq_exit(irqchip, desc);

}



static int mrfld_irq_init_hw(struct gpio_chip *chip)

static void mrfld_irq_init_hw(struct mrfld_gpio *priv)

{

	struct mrfld_gpio *priv = gpiochip_get_data(chip);

	void __iomem *reg;

	unsigned int base;
@@ -376,8 +375,6 @@ static int mrfld_irq_init_hw(struct gpio_chip *chip) 
		reg = gpio_reg(&priv->chip, base, GFER);

		writel(0, reg);

	}



	return 0;

}



static const char *mrfld_gpio_get_pinctrl_dev_name(struct mrfld_gpio *priv)
@@ -400,7 +397,6 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id 
{

	const struct mrfld_gpio_pinrange *range;

	const char *pinctrl_dev_name;

	struct gpio_irq_chip *girq;

	struct mrfld_gpio *priv;

	u32 gpio_base, irq_base;

	void __iomem *base;
@@ -448,21 +444,6 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id 


	raw_spin_lock_init(&priv->lock);



	girq = &priv->chip.irq;

	girq->chip = &mrfld_irqchip;

	girq->init_hw = mrfld_irq_init_hw;

	girq->parent_handler = mrfld_irq_handler;

	girq->num_parents = 1;

	girq->parents = devm_kcalloc(&pdev->dev, girq->num_parents,

				     sizeof(*girq->parents),

				     GFP_KERNEL);

	if (!girq->parents)

		return -ENOMEM;

	girq->parents[0] = pdev->irq;

	girq->first = irq_base;

	girq->default_type = IRQ_TYPE_NONE;

	girq->handler = handle_bad_irq;



	pci_set_drvdata(pdev, priv);

	retval = devm_gpiochip_add_data(&pdev->dev, &priv->chip, priv);

	if (retval) {
@@ -484,6 +465,18 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id 
		}

	}



	retval = gpiochip_irqchip_add(&priv->chip, &mrfld_irqchip, irq_base,

				      handle_bad_irq, IRQ_TYPE_NONE);

	if (retval) {

		dev_err(&pdev->dev, "could not connect irqchip to gpiochip\n");

		return retval;

	}



	mrfld_irq_init_hw(priv);



	gpiochip_set_chained_irqchip(&priv->chip, &mrfld_irqchip, pdev->irq,

				     mrfld_irq_handler);



	return 0;

}

tools/gpio/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -3,7 +3,11 @@ include ../scripts/Makefile.include 


bindir ?= /usr/bin



ifeq ($(srctree),)

# This will work when gpio is built in tools env. where srctree

# isn't set and when invoked from selftests build, where srctree

# is set to ".". building_out_of_srctree is undefined for in srctree

# builds

ifndef building_out_of_srctree

srctree := $(patsubst %/,%,$(dir $(CURDIR)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

endif