gpiolib / ACPI: convert to gpiod interfaces (936e15dd) · Commits · e / devices / android_kernel_teracube_2e

drivers/gpio/gpiolib-acpi.c

+25 −26

Original line number	Original line	Diff line number	Diff line
	@@ -11,7 +11,7 @@
	*/		*/

	#include <linux/errno.h>		#include <linux/errno.h>
	#include <linux/gpio.h>		#include <linux/gpio/consumer.h>
	#include <linux/export.h>		#include <linux/export.h>
	#include <linux/acpi_gpio.h>		#include <linux/acpi_gpio.h>
	#include <linux/acpi.h>		#include <linux/acpi.h>
	@@ -33,14 +33,15 @@ static int acpi_gpiochip_find(struct gpio_chip gc, void data)
	}		}

	/**		/**
	* acpi_get_gpio() - Translate ACPI GPIO pin to GPIO number usable with GPIO API		* acpi_get_gpiod() - Translate ACPI GPIO pin to GPIO descriptor usable with GPIO API
	* @path: ACPI GPIO controller full path name, (e.g. "\\_SB.GPO1")		* @path: ACPI GPIO controller full path name, (e.g. "\\_SB.GPO1")
	* @pin: ACPI GPIO pin number (0-based, controller-relative)		* @pin: ACPI GPIO pin number (0-based, controller-relative)
	*		*
	* Returns GPIO number to use with Linux generic GPIO API, or errno error value		* Returns GPIO descriptor to use with Linux generic GPIO API, or ERR_PTR
			* error value
	*/		*/

	int acpi_get_gpio(char *path, int pin)		static struct gpio_desc acpi_get_gpiod(char path, int pin)
	{		{
	struct gpio_chip *chip;		struct gpio_chip *chip;
	acpi_handle handle;		acpi_handle handle;
	@@ -48,18 +49,17 @@ int acpi_get_gpio(char *path, int pin)

	status = acpi_get_handle(NULL, path, &handle);		status = acpi_get_handle(NULL, path, &handle);
	if (ACPI_FAILURE(status))		if (ACPI_FAILURE(status))
	return -ENODEV;		return ERR_PTR(-ENODEV);

	chip = gpiochip_find(handle, acpi_gpiochip_find);		chip = gpiochip_find(handle, acpi_gpiochip_find);
	if (!chip)		if (!chip)
	return -ENODEV;		return ERR_PTR(-ENODEV);

	if (!gpio_is_valid(chip->base + pin))		if (pin < 0 \|\| pin > chip->ngpio)
	return -EINVAL;		return ERR_PTR(-EINVAL);

	return chip->base + pin;		return gpio_to_desc(chip->base + pin);
	}		}
	EXPORT_SYMBOL_GPL(acpi_get_gpio);

	static irqreturn_t acpi_gpio_irq_handler(int irq, void *data)		static irqreturn_t acpi_gpio_irq_handler(int irq, void *data)
	{		{
	@@ -235,7 +235,7 @@ EXPORT_SYMBOL(acpi_gpiochip_free_interrupts);
	struct acpi_gpio_lookup {		struct acpi_gpio_lookup {
	struct acpi_gpio_info info;		struct acpi_gpio_info info;
	int index;		int index;
	int gpio;		struct gpio_desc *desc;
	int n;		int n;
	};		};

	@@ -246,10 +246,10 @@ static int acpi_find_gpio(struct acpi_resource ares, void data)
	if (ares->type != ACPI_RESOURCE_TYPE_GPIO)		if (ares->type != ACPI_RESOURCE_TYPE_GPIO)
	return 1;		return 1;

	if (lookup->n++ == lookup->index && lookup->gpio < 0) {		if (lookup->n++ == lookup->index && !lookup->desc) {
	const struct acpi_resource_gpio *agpio = &ares->data.gpio;		const struct acpi_resource_gpio *agpio = &ares->data.gpio;

	lookup->gpio = acpi_get_gpio(agpio->resource_source.string_ptr,		lookup->desc = acpi_get_gpiod(agpio->resource_source.string_ptr,
	agpio->pin_table[0]);		agpio->pin_table[0]);
	lookup->info.gpioint =		lookup->info.gpioint =
	agpio->connection_type == ACPI_RESOURCE_GPIO_TYPE_INT;		agpio->connection_type == ACPI_RESOURCE_GPIO_TYPE_INT;
	@@ -259,23 +259,23 @@ static int acpi_find_gpio(struct acpi_resource ares, void data)
	}		}

	/**		/**
	* acpi_get_gpio_by_index() - get a GPIO number from device resources		* acpi_get_gpiod_by_index() - get a GPIO descriptor from device resources
	* @dev: pointer to a device to get GPIO from		* @dev: pointer to a device to get GPIO from
	* @index: index of GpioIo/GpioInt resource (starting from %0)		* @index: index of GpioIo/GpioInt resource (starting from %0)
	* @info: info pointer to fill in (optional)		* @info: info pointer to fill in (optional)
	*		*
	* Function goes through ACPI resources for @dev and based on @index looks		* Function goes through ACPI resources for @dev and based on @index looks
	* up a GpioIo/GpioInt resource, translates it to the Linux GPIO number,		* up a GpioIo/GpioInt resource, translates it to the Linux GPIO descriptor,
	* and returns it. @index matches GpioIo/GpioInt resources only so if there		* and returns it. @index matches GpioIo/GpioInt resources only so if there
	* are total %3 GPIO resources, the index goes from %0 to %2.		* are total %3 GPIO resources, the index goes from %0 to %2.
	*		*
	* If the GPIO cannot be translated or there is an error, negative errno is		* If the GPIO cannot be translated or there is an error an ERR_PTR is
	* returned.		* returned.
	*		*
	* Note: if the GPIO resource has multiple entries in the pin list, this		* Note: if the GPIO resource has multiple entries in the pin list, this
	* function only returns the first.		* function only returns the first.
	*/		*/
	int acpi_get_gpio_by_index(struct device *dev, int index,		struct gpio_desc acpi_get_gpiod_by_index(struct device dev, int index,
	struct acpi_gpio_info *info)		struct acpi_gpio_info *info)
	{		{
	struct acpi_gpio_lookup lookup;		struct acpi_gpio_lookup lookup;
	@@ -285,27 +285,26 @@ int acpi_get_gpio_by_index(struct device *dev, int index,
	int ret;		int ret;

	if (!dev)		if (!dev)
	return -EINVAL;		return ERR_PTR(-EINVAL);

	handle = ACPI_HANDLE(dev);		handle = ACPI_HANDLE(dev);
	if (!handle \|\| acpi_bus_get_device(handle, &adev))		if (!handle \|\| acpi_bus_get_device(handle, &adev))
	return -ENODEV;		return ERR_PTR(-ENODEV);

	memset(&lookup, 0, sizeof(lookup));		memset(&lookup, 0, sizeof(lookup));
	lookup.index = index;		lookup.index = index;
	lookup.gpio = -ENODEV;

	INIT_LIST_HEAD(&resource_list);		INIT_LIST_HEAD(&resource_list);
	ret = acpi_dev_get_resources(adev, &resource_list, acpi_find_gpio,		ret = acpi_dev_get_resources(adev, &resource_list, acpi_find_gpio,
	&lookup);		&lookup);
	if (ret < 0)		if (ret < 0)
	return ret;		return ERR_PTR(ret);

	acpi_dev_free_resource_list(&resource_list);		acpi_dev_free_resource_list(&resource_list);

	if (lookup.gpio >= 0 && info)		if (lookup.desc && info)
	*info = lookup.info;		*info = lookup.info;

	return lookup.gpio;		return lookup.desc ? lookup.desc : ERR_PTR(-ENODEV);
	}		}
	EXPORT_SYMBOL_GPL(acpi_get_gpio_by_index);		EXPORT_SYMBOL_GPL(acpi_get_gpiod_by_index);

include/linux/acpi_gpio.h

+18 −11

Original line number	Original line	Diff line number	Diff line
	@@ -2,8 +2,10 @@
	#define _LINUX_ACPI_GPIO_H_		#define _LINUX_ACPI_GPIO_H_

	#include <linux/device.h>		#include <linux/device.h>
			#include <linux/err.h>
	#include <linux/errno.h>		#include <linux/errno.h>
	#include <linux/gpio.h>		#include <linux/gpio.h>
			#include <linux/gpio/consumer.h>

	/**		/**
	* struct acpi_gpio_info - ACPI GPIO specific information		* struct acpi_gpio_info - ACPI GPIO specific information
	@@ -15,23 +17,18 @@ struct acpi_gpio_info {

	#ifdef CONFIG_GPIO_ACPI		#ifdef CONFIG_GPIO_ACPI

	int acpi_get_gpio(char *path, int pin);		struct gpio_desc acpi_get_gpiod_by_index(struct device dev, int index,
	int acpi_get_gpio_by_index(struct device *dev, int index,
	struct acpi_gpio_info *info);		struct acpi_gpio_info *info);
	void acpi_gpiochip_request_interrupts(struct gpio_chip *chip);		void acpi_gpiochip_request_interrupts(struct gpio_chip *chip);
	void acpi_gpiochip_free_interrupts(struct gpio_chip *chip);		void acpi_gpiochip_free_interrupts(struct gpio_chip *chip);

	#else /* CONFIG_GPIO_ACPI */		#else /* CONFIG_GPIO_ACPI */

	static inline int acpi_get_gpio(char *path, int pin)		static inline struct gpio_desc *
	{		acpi_get_gpiod_by_index(struct device *dev, int index,
	return -ENODEV;
	}

	static inline int acpi_get_gpio_by_index(struct device *dev, int index,
	struct acpi_gpio_info *info)		struct acpi_gpio_info *info)
	{		{
	return -ENODEV;		return ERR_PTR(-ENOSYS);
	}		}

	static inline void acpi_gpiochip_request_interrupts(struct gpio_chip *chip) { }		static inline void acpi_gpiochip_request_interrupts(struct gpio_chip *chip) { }
	@@ -39,4 +36,14 @@ static inline void acpi_gpiochip_free_interrupts(struct gpio_chip *chip) { }

	#endif /* CONFIG_GPIO_ACPI */		#endif /* CONFIG_GPIO_ACPI */

			static inline int acpi_get_gpio_by_index(struct device *dev, int index,
			struct acpi_gpio_info *info)
			{
			struct gpio_desc *desc = acpi_get_gpiod_by_index(dev, index, info);

			if (IS_ERR(desc))
			return PTR_ERR(desc);
			return desc_to_gpio(desc);
			}

	#endif /* _LINUX_ACPI_GPIO_H_ */		#endif /* _LINUX_ACPI_GPIO_H_ */