Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81f59e9d authored by Mika Westerberg's avatar Mika Westerberg Committed by Linus Walleij
Browse files

gpiolib / ACPI: add ACPI support for gpiod_get_index() 



gpiod_get_index() and gpiod_get() are now the new preferred way to request
GPIOs. Add support for finding the corresponding GPIO descriptor from ACPI
namespace.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 936e15dd

drivers/gpio/gpiolib.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/seq_file.h>

#include <linux/seq_file.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/of_gpio.h>

#include <linux/of_gpio.h>

#include <linux/acpi_gpio.h>

#include <linux/idr.h>

#include <linux/idr.h>

#include <linux/slab.h>

#include <linux/slab.h>
@@ -2260,6 +2261,12 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, 
}

}

#endif

#endif





static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id,

					unsigned int idx, unsigned long *flags)

{

	return acpi_get_gpiod_by_index(dev, idx, NULL);

}



static struct gpio_desc *gpiod_find(struct device *dev, const char *con_id,

static struct gpio_desc *gpiod_find(struct device *dev, const char *con_id,

				    unsigned int idx, unsigned long *flags)

				    unsigned int idx, unsigned long *flags)

{

{
@@ -2361,6 +2368,9 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev, 
	if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node) {

	if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node) {

		dev_dbg(dev, "using device tree for GPIO lookup\n");

		dev_dbg(dev, "using device tree for GPIO lookup\n");

		desc = of_find_gpio(dev, con_id, idx, &flags);

		desc = of_find_gpio(dev, con_id, idx, &flags);

	} else if (IS_ENABLED(CONFIG_ACPI) && dev && ACPI_HANDLE(dev)) {

		dev_dbg(dev, "using ACPI for GPIO lookup\n");

		desc = acpi_find_gpio(dev, con_id, idx, &flags);

	} else {

	} else {

		dev_dbg(dev, "using lookup tables for GPIO lookup");

		dev_dbg(dev, "using lookup tables for GPIO lookup");

		desc = gpiod_find(dev, con_id, idx, &flags);

		desc = gpiod_find(dev, con_id, idx, &flags);