linux-next: manual merge of the gpio tree with the kspp-gustavo tree

[Stephen Rothwell]

Hi all,

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

  drivers/gpio/gpiolib-acpi.c

between commit:

  b8e0b635e6e6 ("gpio: Fix fall-through warnings for Clang")

from the kspp-gustavo tree and commit:

  1a81f19154b4 ("gpiolib: acpi: Move acpi_gpio_to_gpiod_flags() upper in the 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/gpiolib-acpi.c
index 23fa9df8241d,6cc5f91bfe2e..000000000000
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@@ -205,6 -205,67 +205,68 @@@ static void acpi_gpiochip_request_irqs(
  		acpi_gpiochip_request_irq(acpi_gpio, event);
  }
  
+ static enum gpiod_flags
+ acpi_gpio_to_gpiod_flags(const struct acpi_resource_gpio *agpio, int polarity)
+ {
+ 	/* GpioInt() implies input configuration */
+ 	if (agpio->connection_type == ACPI_RESOURCE_GPIO_TYPE_INT)
+ 		return GPIOD_IN;
+ 
+ 	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
+ 		 * and the polarity 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. For active low
+ 		 * polarity values will be switched. See also
+ 		 * Documentation/firmware-guide/acpi/gpio-properties.rst.
+ 		 */
+ 		switch (agpio->pin_config) {
+ 		case ACPI_PIN_CONFIG_PULLUP:
+ 			return polarity == GPIO_ACTIVE_LOW ? GPIOD_OUT_LOW : GPIOD_OUT_HIGH;
+ 		case ACPI_PIN_CONFIG_PULLDOWN:
+ 			return polarity == GPIO_ACTIVE_LOW ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW;
+ 		default:
+ 			break;
+ 		}
++		break;
+ 	default:
+ 		break;
+ 	}
+ 
+ 	/*
+ 	 * Assume that the BIOS has configured the direction and pull
+ 	 * accordingly.
+ 	 */
+ 	return GPIOD_ASIS;
+ }
+ 
+ static struct gpio_desc *acpi_request_own_gpiod(struct gpio_chip *chip,
+ 						struct acpi_resource_gpio *agpio,
+ 						unsigned int index,
+ 						const char *label)
+ {
+ 	int polarity = GPIO_ACTIVE_HIGH;
+ 	enum gpiod_flags flags = acpi_gpio_to_gpiod_flags(agpio, polarity);
+ 	unsigned int pin = agpio->pin_table[index];
+ 	struct gpio_desc *desc;
+ 	int ret;
+ 
+ 	desc = gpiochip_request_own_desc(chip, pin, label, polarity, flags);
+ 	if (IS_ERR(desc))
+ 		return desc;
+ 
+ 	ret = gpio_set_debounce_timeout(desc, agpio->debounce_timeout);
+ 	if (ret)
+ 		gpiochip_free_own_desc(desc);
+ 
+ 	return ret ? ERR_PTR(ret) : desc;
+ }
+ 
  static bool acpi_gpio_in_ignore_list(const char *controller_in, int pin_in)
  {
  	const char *controller, *pin_str;

Attachment: pgp7aLuM_DaWA.pgp
Description: OpenPGP digital signature