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

gpiolib: acpi: Allow to find GpioInt() resource by name and index 



Currently only search by index is supported. However, in some cases
we might need to pass the quirks to the acpi_dev_gpio_irq_get().

For this, split out acpi_dev_gpio_irq_get_by() and replace
acpi_dev_gpio_irq_get() by calling above with NULL for name parameter.

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 62d5247d

drivers/gpio/gpiolib-acpi.c

+8 −4
Original line number Diff line number Diff line
@@ -945,8 +945,9 @@ struct gpio_desc *acpi_node_get_gpiod(struct fwnode_handle *fwnode, 
}



/**

 * acpi_dev_gpio_irq_get() - Find GpioInt and translate it to Linux IRQ number

 * acpi_dev_gpio_irq_get_by() - Find GpioInt and translate it to Linux IRQ number

 * @adev: pointer to a ACPI device to get IRQ from

 * @name: optional name of GpioInt resource

 * @index: index of GpioInt resource (starting from %0)

 *

 * If the device has one or more GpioInt resources, this function can be
@@ -956,9 +957,12 @@ struct gpio_desc *acpi_node_get_gpiod(struct fwnode_handle *fwnode, 
 * The function is idempotent, though each time it runs it will configure GPIO

 * pin direction according to the flags in GpioInt resource.

 *

 * The function takes optional @name parameter. If the resource has a property

 * name, then only those will be taken into account.

 *

 * Return: Linux IRQ number (> %0) on success, negative errno on failure.

 */

int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)

int acpi_dev_gpio_irq_get_by(struct acpi_device *adev, const char *name, int index)

{

	int idx, i;

	unsigned int irq_flags;
@@ -968,7 +972,7 @@ int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index) 
		struct acpi_gpio_info info;

		struct gpio_desc *desc;



		desc = acpi_get_gpiod_by_index(adev, NULL, i, &info);

		desc = acpi_get_gpiod_by_index(adev, name, i, &info);



		/* Ignore -EPROBE_DEFER, it only matters if idx matches */

		if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER)
@@ -1013,7 +1017,7 @@ int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index) 
	}

	return -ENOENT;

}

EXPORT_SYMBOL_GPL(acpi_dev_gpio_irq_get);

EXPORT_SYMBOL_GPL(acpi_dev_gpio_irq_get_by);



static acpi_status

acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,

include/linux/acpi.h

+8 −2
Original line number Diff line number Diff line
@@ -1079,19 +1079,25 @@ void __acpi_handle_debug(struct _ddebug *descriptor, acpi_handle handle, const c 
#if defined(CONFIG_ACPI) && defined(CONFIG_GPIOLIB)

bool acpi_gpio_get_irq_resource(struct acpi_resource *ares,

				struct acpi_resource_gpio **agpio);

int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index);

int acpi_dev_gpio_irq_get_by(struct acpi_device *adev, const char *name, int index);

#else

static inline bool acpi_gpio_get_irq_resource(struct acpi_resource *ares,

					      struct acpi_resource_gpio **agpio)

{

	return false;

}

static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)

static inline int acpi_dev_gpio_irq_get_by(struct acpi_device *adev,

					   const char *name, int index)

{

	return -ENXIO;

}

#endif



static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)

{

	return acpi_dev_gpio_irq_get_by(adev, NULL, index);

}



/* Device properties */



#ifdef CONFIG_ACPI