Commit 62d5247d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bartosz Golaszewski
Browse files

gpiolib: acpi: Add ACPI_GPIO_QUIRK_ABSOLUTE_NUMBER quirk 



On some systems the ACPI tables has wrong pin number and instead of
having a relative one it provides an absolute one in the global GPIO
number space.

Add ACPI_GPIO_QUIRK_ABSOLUTE_NUMBER quirk to cope with such cases.

Fixes: ba8c90c6 ("gpio: pca953x: Override IRQ for one of the expanders on Galileo Gen 2")
Depends-on: 0ea68393 ("gpio: dwapb: Convert driver to using the GPIO-lib-based IRQ-chip")
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 6e5d5791

drivers/gpio/gpiolib-acpi.c

+6 −1
Original line number Diff line number Diff line
@@ -677,6 +677,7 @@ static int acpi_populate_gpio_lookup(struct acpi_resource *ares, void *data) 
	if (!lookup->desc) {

		const struct acpi_resource_gpio *agpio = &ares->data.gpio;

		bool gpioint = agpio->connection_type == ACPI_RESOURCE_GPIO_TYPE_INT;

		struct gpio_desc *desc;

		u16 pin_index;



		if (lookup->info.quirks & ACPI_GPIO_QUIRK_ONLY_GPIOIO && gpioint)
@@ -689,8 +690,12 @@ static int acpi_populate_gpio_lookup(struct acpi_resource *ares, void *data) 
		if (pin_index >= agpio->pin_table_length)

			return 1;



		lookup->desc = acpi_get_gpiod(agpio->resource_source.string_ptr,

		if (lookup->info.quirks & ACPI_GPIO_QUIRK_ABSOLUTE_NUMBER)

			desc = gpio_to_desc(agpio->pin_table[pin_index]);

		else

			desc = acpi_get_gpiod(agpio->resource_source.string_ptr,

					      agpio->pin_table[pin_index]);

		lookup->desc = desc;

		lookup->info.pin_config = agpio->pin_config;

		lookup->info.debounce = agpio->debounce_timeout;

		lookup->info.gpioint = gpioint;

include/linux/gpio/consumer.h

+2 −0
Original line number Diff line number Diff line
@@ -674,6 +674,8 @@ struct acpi_gpio_mapping { 
 * get GpioIo type explicitly, this quirk may be used.

 */

#define ACPI_GPIO_QUIRK_ONLY_GPIOIO		BIT(1)

/* Use given pin as an absolute GPIO number in the system */

#define ACPI_GPIO_QUIRK_ABSOLUTE_NUMBER		BIT(2)



	unsigned int quirks;

};