Subject: linux-next: manual merge of the pinctrl tree with the gpio tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 26 Aug 2019 21:02:52 +1000

Hi all,

Today's linux-next merge of the pinctrl tree got a conflict in:

  drivers/pinctrl/bcm/pinctrl-bcm2835.c

between commit:

  82357f82ec69 ("pinctrl: bcm2835: Pass irqchip when adding gpiochip")

from the gpio tree and commit:

  e38a9a437fb9 ("pinctrl: bcm2835: Add support for BCM2711 pull-up functionality")

from the pinctrl tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pinctrl/bcm/pinctrl-bcm2835.c
index b729997cd887,a493205bedaf..000000000000
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@@ -994,9 -1087,10 +1086,11 @@@ static int bcm2835_pinctrl_probe(struc
  	struct device *dev = &pdev->dev;
  	struct device_node *np = dev->of_node;
  	struct bcm2835_pinctrl *pc;
 +	struct gpio_irq_chip *girq;
  	struct resource iomem;
  	int err, i;
+ 	const struct of_device_id *match;
+ 
  	BUILD_BUG_ON(ARRAY_SIZE(bcm2835_gpio_pins) != BCM2835_NUM_GPIOS);
  	BUILD_BUG_ON(ARRAY_SIZE(bcm2835_gpio_groups) != BCM2835_NUM_GPIOS);
  
@@@ -1069,6 -1141,38 +1163,12 @@@
  		return err;
  	}
  
 -	err = gpiochip_irqchip_add(&pc->gpio_chip, &bcm2835_gpio_irq_chip,
 -				   0, handle_level_irq, IRQ_TYPE_NONE);
 -	if (err) {
 -		dev_info(dev, "could not add irqchip\n");
 -		return err;
 -	}
 -
 -	for (i = 0; i < BCM2835_NUM_IRQS; i++) {
 -		pc->irq[i] = irq_of_parse_and_map(np, i);
 -
 -		if (pc->irq[i] == 0)
 -			continue;
 -
 -		/*
 -		 * Use the same handler for all groups: this is necessary
 -		 * since we use one gpiochip to cover all lines - the
 -		 * irq handler then needs to figure out which group and
 -		 * bank that was firing the IRQ and look up the per-group
 -		 * and bank data.
 -		 */
 -		gpiochip_set_chained_irqchip(&pc->gpio_chip,
 -					     &bcm2835_gpio_irq_chip,
 -					     pc->irq[i],
 -					     bcm2835_gpio_irq_handler);
 -	}
 -
+ 	match = of_match_node(bcm2835_pinctrl_match, pdev->dev.of_node);
+ 	if (match) {
+ 		bcm2835_pinctrl_desc.confops =
+ 			(const struct pinconf_ops *)match->data;
+ 	}
+ 
  	pc->pctl_dev = devm_pinctrl_register(dev, &bcm2835_pinctrl_desc, pc);
  	if (IS_ERR(pc->pctl_dev)) {
  		gpiochip_remove(&pc->gpio_chip);