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

[Linus Walleij <linus.walleij@xxxxxxxxxx>]

Hi Bartosz,

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;
  }

++<<<<<<< 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;
+       default:
+               break;
+       }
+
+       /*
+        * Assume that the BIOS has configured the direction and pull
+        * accordingly.
+        */
+       return GPIOD_ASIS;
+ }
+
++>>>>>>> 1542ec5eaddb45b4fe625de3d95ee4e94226514d
  static int
  __acpi_gpio_update_gpiod_flags(enum gpiod_flags *flags, enum
gpiod_flags update)
  {

I don't exactly know what do do here ... any advice?

Yours,
Linus Walleij