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

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

[Stephen Rothwell]

Hi Linus,

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

  drivers/gpio/gpio-mxc.c

between commit:

  e188cbf7564f ("gpio: mxc: shift gpio_mxc_init() to subsys_initcall level")

from the pinctrl tree and commit:

  2c8d6c869feb ("gpio: mxc: drop unused MODULE_ tags from non-modular code")

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-mxc.c
index e38989a4fa0c,e35af5249478..000000000000
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@@ -515,10 -510,4 +515,4 @@@ static int __init gpio_mxc_init(void
  {
  	return platform_driver_register(&mxc_gpio_driver);
  }
 -postcore_initcall(gpio_mxc_init);
 +subsys_initcall(gpio_mxc_init);
- 
- MODULE_AUTHOR("Freescale Semiconductor, "
- 	      "Daniel Mack <danielncaiaq.de>, "
- 	      "Juergen Beisert <kernel@pengutronix.de>");
- MODULE_DESCRIPTION("Freescale MXC GPIO");
- MODULE_LICENSE("GPL");

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

[Stephen Rothwell]

Hi Geert,

On Tue, 16 Feb 2016 09:23:48 +0100 Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> That resolution looks correct to me, but doesn't match your end result
> in next-20160216:
> 
>         u32 set_mux = pctl->desc->irq_read_needs_mux &&
>                         test_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
>         u32 pin = offset + chip->base;
> 
> I think the end result should be:
> 
>         bool set_mux = pctl->desc->irq_read_needs_mux &&
>                 gpiochip_line_is_irq(chip, offset);
>         u32 pin = offset + chip->base;

Yeah, that's because the resulting tree failed to build so I undid the
merge and merged yesterday's version of the gpio tree.

-- 
Cheers,
Stephen Rothwell

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

[Geert Uytterhoeven]

Hi Stephen,

On Tue, Feb 16, 2016 at 4:37 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the gpio tree got a conflict in:
>
>   drivers/pinctrl/sunxi/pinctrl-sunxi.c
>
> between commit:
>
>   be2d107f4433 ("pinctrl: sunxi: Use pin number when calling sunxi_pmx_set")
>
> from the pinctrl tree and commit:
>
>   6cee3821e4e4 ("gpio/pinctrl: sunxi: stop poking around in private vars")
>
> from the gpio tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/pinctrl/sunxi/pinctrl-sunxi.c
> index 96f64a104a62,3e95bfe66a06..000000000000
> --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> @@@ -457,9 -457,8 +457,9 @@@ static int sunxi_pinctrl_gpio_get(struc
>         struct sunxi_pinctrl *pctl = gpiochip_get_data(chip);
>         u32 reg = sunxi_data_reg(offset);
>         u8 index = sunxi_data_offset(offset);
> -       u32 set_mux = pctl->desc->irq_read_needs_mux &&
> -                       test_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
> +       bool set_mux = pctl->desc->irq_read_needs_mux &&
> +               gpiochip_line_is_irq(chip, offset);
>  +      u32 pin = offset + chip->base;
>         u32 val;
>
>         if (set_mux)

That resolution looks correct to me, but doesn't match your end result
in next-20160216:

        u32 set_mux = pctl->desc->irq_read_needs_mux &&
                        test_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
        u32 pin = offset + chip->base;

I think the end result should be:

        bool set_mux = pctl->desc->irq_read_needs_mux &&
                gpiochip_line_is_irq(chip, offset);
        u32 pin = offset + chip->base;

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

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

[Stephen Rothwell]

Hi Linus,

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

  drivers/pinctrl/sunxi/pinctrl-sunxi.c

between commit:

  be2d107f4433 ("pinctrl: sunxi: Use pin number when calling sunxi_pmx_set")

from the pinctrl tree and commit:

  6cee3821e4e4 ("gpio/pinctrl: sunxi: stop poking around in private vars")

from the gpio tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pinctrl/sunxi/pinctrl-sunxi.c
index 96f64a104a62,3e95bfe66a06..000000000000
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@@ -457,9 -457,8 +457,9 @@@ static int sunxi_pinctrl_gpio_get(struc
  	struct sunxi_pinctrl *pctl = gpiochip_get_data(chip);
  	u32 reg = sunxi_data_reg(offset);
  	u8 index = sunxi_data_offset(offset);
- 	u32 set_mux = pctl->desc->irq_read_needs_mux &&
- 			test_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
+ 	bool set_mux = pctl->desc->irq_read_needs_mux &&
+ 		gpiochip_line_is_irq(chip, offset);
 +	u32 pin = offset + chip->base;
  	u32 val;
  
  	if (set_mux)

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1209 bytes --]

Hi Linus,

Today's linux-next merge of the gpio tree got a conflict in
drivers/pinctrl/qcom/pinctrl-msm.c between commit cf1fc1876289
("pinctrl: qcom: use restart_notifier mechanism for ps_hold") from the
pinctrl tree and commit 2fcea6cecbc9 ("pinctrl: remove remaining users
of gpiochip_remove() retval") from the gpio tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/pinctrl/qcom/pinctrl-msm.c
index d30dddd21323,041677113a48..000000000000
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@@ -936,18 -903,9 +936,10 @@@ EXPORT_SYMBOL(msm_pinctrl_probe)
  int msm_pinctrl_remove(struct platform_device *pdev)
  {
  	struct msm_pinctrl *pctrl = platform_get_drvdata(pdev);
- 	int ret;
- 
- 	ret = gpiochip_remove(&pctrl->chip);
- 	if (ret) {
- 		dev_err(&pdev->dev, "Failed to remove gpiochip\n");
- 		return ret;
- 	}
  
+ 	gpiochip_remove(&pctrl->chip);
  	pinctrl_unregister(pctrl->pctrl);
- 
 +	unregister_restart_handler(&pctrl->restart_nb);
- 
  	return 0;
  }
  EXPORT_SYMBOL(msm_pinctrl_remove);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]