Re: [GIT PULL] gpio: updates for v5.11-rc1

[Linus Walleij <linus.walleij@xxxxxxxxxx>]

On Wed, Dec 9, 2020 at 11:13 AM Bartosz Golaszewski <brgl@xxxxxxxx> wrote:
> On Wed, Dec 9, 2020 at 11:07 AM Linus Walleij <linus.walleij@xxxxxxxxxx> wrote:
> > On Wed, Dec 9, 2020 at 10:52 AM Bartosz Golaszewski <brgl@xxxxxxxx> wrote:
> >
> > > These are the patches I collected over this release cycle. Nothing all
> > > too exciting - mainly just updates to drivers and refactoring of the
> > > core code. Please pull.
> >
> > Nice!
> >
> > But I get a merge conflict in gpiolib-acpi.c! Since I said Andy should
> > be maintaining that file it makes me a bit nervous.
> >
> > It looks like this:
> >
> > index 6cc5f91bfe2e,23fa9df8241d..000000000000
> > --- a/drivers/gpio/gpiolib-acpi.c
> > +++ b/drivers/gpio/gpiolib-acpi.c
> > @@@ -586,6 -526,40 +586,43 @@@ static bool acpi_get_driver_gpio_data(s
> >         return false;
> >   }
>
> Strange, I didn't see any conflicts in next...
>
> >
> > ++<<<<<<< HEAD
> > ++=======
> > + static enum gpiod_flags
> > + acpi_gpio_to_gpiod_flags(const struct acpi_resource_gpio *agpio)
> > + {
> > +       switch (agpio->io_restriction) {
> > +       case ACPI_IO_RESTRICT_INPUT:
> > +               return GPIOD_IN;
> > +       case ACPI_IO_RESTRICT_OUTPUT:
> > +               /*
> > +                * ACPI GPIO resources don't contain an initial value for the
> > +                * GPIO. Therefore we deduce that value from the pull field
> > +                * instead. If the pin is pulled up we assume default to be
> > +                * high, if it is pulled down we assume default to be low,
> > +                * otherwise we leave pin untouched.
> > +                */
> > +               switch (agpio->pin_config) {
> > +               case ACPI_PIN_CONFIG_PULLUP:
> > +                       return GPIOD_OUT_HIGH;
> > +               case ACPI_PIN_CONFIG_PULLDOWN:
> > +                       return GPIOD_OUT_LOW;
> > +               default:
> > +                       break;
> > +               }
> > +               break;
>
> This break is the only thing I have in my tree. Andy told me to take
> that patch with his ack. It seems you don't have this function in your
> tree - was it moved at some point?

Hm yeah I have a bunch of ACPI things I pulled from Andy in my tree.

I can try just -3 I guess. I assume the function shall be there.

Yours,
Linus Walleij