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

Commit 2838bf94 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

gpiolib-acpi: Move acpi_dev_add_driver_gpios() et al to consumer.h 



The API, which belongs to GPIO library, is foreign to ACPI headers. Earlier
we moved out I²C out of the latter, and now it's time for
acpi_dev_add_driver_gpios() et al.

For time being the acpi_gpio_get_irq_resource() and acpi_dev_gpio_irq_get()
are left untouched as they need more thought about.

Note, it requires uninline acpi_dev_remove_driver_gpios() to keep purity of
consumer.h.

Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Cc: Jie Yang <yang.jie@linux.intel.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org (moderated list:INTEL ASoC DRIVERS)
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20190730104337.21235-3-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 77cb907a

drivers/gpio/gpiolib-acpi.c

+7 −0
Original line number Diff line number Diff line
@@ -383,6 +383,13 @@ int acpi_dev_add_driver_gpios(struct acpi_device *adev, 
}

EXPORT_SYMBOL_GPL(acpi_dev_add_driver_gpios);



void acpi_dev_remove_driver_gpios(struct acpi_device *adev)

{

	if (adev)

		adev->driver_gpios = NULL;

}

EXPORT_SYMBOL_GPL(acpi_dev_remove_driver_gpios);



static void devm_acpi_dev_release_driver_gpios(struct device *dev, void *res)

{

	acpi_dev_remove_driver_gpios(ACPI_COMPANION(dev));

include/linux/acpi.h

+0 −51
Original line number Diff line number Diff line
@@ -994,62 +994,11 @@ void __acpi_handle_debug(struct _ddebug *descriptor, acpi_handle handle, const c 
#endif

#endif



struct acpi_gpio_params {

	unsigned int crs_entry_index;

	unsigned int line_index;

	bool active_low;

};



struct acpi_gpio_mapping {

	const char *name;

	const struct acpi_gpio_params *data;

	unsigned int size;



/* Ignore IoRestriction field */

#define ACPI_GPIO_QUIRK_NO_IO_RESTRICTION	BIT(0)

/*

 * When ACPI GPIO mapping table is in use the index parameter inside it

 * refers to the GPIO resource in _CRS method. That index has no

 * distinction of actual type of the resource. When consumer wants to

 * get GpioIo type explicitly, this quirk may be used.

 */

#define ACPI_GPIO_QUIRK_ONLY_GPIOIO		BIT(1)



	unsigned int quirks;

};



#if defined(CONFIG_ACPI) && defined(CONFIG_GPIOLIB)

int acpi_dev_add_driver_gpios(struct acpi_device *adev,

			      const struct acpi_gpio_mapping *gpios);



static inline void acpi_dev_remove_driver_gpios(struct acpi_device *adev)

{

	if (adev)

		adev->driver_gpios = NULL;

}



int devm_acpi_dev_add_driver_gpios(struct device *dev,

				   const struct acpi_gpio_mapping *gpios);

void devm_acpi_dev_remove_driver_gpios(struct device *dev);



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);

#else

static inline int acpi_dev_add_driver_gpios(struct acpi_device *adev,

			      const struct acpi_gpio_mapping *gpios)

{

	return -ENXIO;

}

static inline void acpi_dev_remove_driver_gpios(struct acpi_device *adev) {}



static inline int devm_acpi_dev_add_driver_gpios(struct device *dev,

			      const struct acpi_gpio_mapping *gpios)

{

	return -ENXIO;

}

static inline void devm_acpi_dev_remove_driver_gpios(struct device *dev) {}



static inline bool acpi_gpio_get_irq_resource(struct acpi_resource *ares,

					      struct acpi_resource_gpio **agpio)

{

include/linux/gpio/consumer.h

+57 −0
Original line number Diff line number Diff line
@@ -602,6 +602,63 @@ struct gpio_desc *devm_gpiod_get_from_of_node(struct device *dev, 


#endif /* CONFIG_GPIOLIB */



struct acpi_gpio_params {

	unsigned int crs_entry_index;

	unsigned int line_index;

	bool active_low;

};



struct acpi_gpio_mapping {

	const char *name;

	const struct acpi_gpio_params *data;

	unsigned int size;



/* Ignore IoRestriction field */

#define ACPI_GPIO_QUIRK_NO_IO_RESTRICTION	BIT(0)

/*

 * When ACPI GPIO mapping table is in use the index parameter inside it

 * refers to the GPIO resource in _CRS method. That index has no

 * distinction of actual type of the resource. When consumer wants to

 * get GpioIo type explicitly, this quirk may be used.

 */

#define ACPI_GPIO_QUIRK_ONLY_GPIOIO		BIT(1)



	unsigned int quirks;

};



#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_ACPI)



struct acpi_device;



int acpi_dev_add_driver_gpios(struct acpi_device *adev,

			      const struct acpi_gpio_mapping *gpios);

void acpi_dev_remove_driver_gpios(struct acpi_device *adev);



int devm_acpi_dev_add_driver_gpios(struct device *dev,

				   const struct acpi_gpio_mapping *gpios);

void devm_acpi_dev_remove_driver_gpios(struct device *dev);



#else  /* CONFIG_GPIOLIB && CONFIG_ACPI */



struct acpi_device;



static inline int acpi_dev_add_driver_gpios(struct acpi_device *adev,

			      const struct acpi_gpio_mapping *gpios)

{

	return -ENXIO;

}

static inline void acpi_dev_remove_driver_gpios(struct acpi_device *adev) {}



static inline int devm_acpi_dev_add_driver_gpios(struct device *dev,

			      const struct acpi_gpio_mapping *gpios)

{

	return -ENXIO;

}

static inline void devm_acpi_dev_remove_driver_gpios(struct device *dev) {}



#endif /* CONFIG_GPIOLIB && CONFIG_ACPI */





#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS)



int gpiod_export(struct gpio_desc *desc, bool direction_may_change);

sound/soc/intel/boards/bytcht_cx2072x.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include <linux/acpi.h>

#include <linux/device.h>

#include <linux/gpio/consumer.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

sound/soc/intel/boards/cht_bsw_max98090_ti.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */



#include <linux/dmi.h>

#include <linux/gpio/consumer.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/slab.h>