linux-next: manual merge of the arm-soc tree with the gpio tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/gpio/gpio-mxs.c between commit 3e11f7b840b4 ("gpio/generic:
initialize basic_mmio_gpio shadow variables properly") from the gpio tree
and commit 164387d2b4ae ("gpio/mxs: get rid of the use of cpu_is_xxx")
from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpio/gpio-mxs.c
index b413650,429228b..0000000
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
@@@ -242,11 -283,11 +283,11 @@@ static int __devinit mxs_gpio_probe(str
  	irq_set_handler_data(port->irq, port);
  
  	err = bgpio_init(&port->bgc, &pdev->dev, 4,
- 			 port->base + PINCTRL_DIN(port->id),
- 			 port->base + PINCTRL_DOUT(port->id), NULL,
- 			 port->base + PINCTRL_DOE(port->id), NULL, 0);
+ 			 port->base + PINCTRL_DIN(port),
+ 			 port->base + PINCTRL_DOUT(port), NULL,
 -			 port->base + PINCTRL_DOE(port), NULL, false);
++			 port->base + PINCTRL_DOE(port), NULL, 0);
  	if (err)
- 		goto out_iounmap;
+ 		return err;
  
  	port->bgc.gc.to_irq = mxs_gpio_to_irq;
  	port->bgc.gc.base = port->id * 32;

Attachment: pgp00000.pgp
Description: PGP signature