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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 21 Aug 2019 16:03:35 +1000

Hi all,

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

  drivers/gpio/gpio-ixp4xx.c

between commit:

  daa19fe5b082 ("gpio/ixp4xx: Register the base PA instead of its VA in fwnode")

from the irqchip tree and commit:

  aa7d618ac65f ("gpio: ixp4xx: Convert to hierarchical GPIOLIB_IRQCHIP")

from the gpio 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/gpio/gpio-ixp4xx.c
index cc72c9aca5a1,8bd23e80c61f..000000000000
--- a/drivers/gpio/gpio-ixp4xx.c
+++ b/drivers/gpio/gpio-ixp4xx.c
@@@ -326,6 -209,35 +209,35 @@@ static int ixp4xx_gpio_probe(struct pla
  		return PTR_ERR(g->base);
  	}
  
+ 	/*
+ 	 * When we convert to device tree we will simply look up the
+ 	 * parent irqdomain using irq_find_host(parent) as parent comes
+ 	 * from IRQCHIP_DECLARE(), then use of_node_to_fwnode() to get
+ 	 * the fwnode. For now we need this boardfile style code.
+ 	 */
+ 	if (np) {
+ 		struct device_node *irq_parent;
+ 
+ 		irq_parent = of_irq_find_parent(np);
+ 		if (!irq_parent) {
+ 			dev_err(dev, "no IRQ parent node\n");
+ 			return -ENODEV;
+ 		}
+ 		parent = irq_find_host(irq_parent);
+ 		if (!parent) {
+ 			dev_err(dev, "no IRQ parent domain\n");
+ 			return -ENODEV;
+ 		}
+ 		g->fwnode = of_node_to_fwnode(np);
+ 	} else {
+ 		parent = ixp4xx_get_irq_domain();
 -		g->fwnode = irq_domain_alloc_fwnode(g->base);
++		g->fwnode = irq_domain_alloc_fwnode(&res->start);
+ 		if (!g->fwnode) {
+ 			dev_err(dev, "no domain base\n");
+ 			return -ENODEV;
+ 		}
+ 	}
+ 
  	/*
  	 * Make sure GPIO 14 and 15 are NOT used as clocks but GPIO on
  	 * specific machines.