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

[Geert Uytterhoeven <geert@linux-m68k.org>]

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