projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'linux-kselftest-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
drivers
/
gpio
/
gpiolib.h
diff --git
a/drivers/gpio/gpiolib.h
b/drivers/gpio/gpiolib.h
index 98ab08c0aa2d2d13344b6af003e6696129193907..99ed3b00ffe916f65229e343c1ba5ebefd9f83b7 100644
(file)
--- a/
drivers/gpio/gpiolib.h
+++ b/
drivers/gpio/gpiolib.h
@@
-16,7
+16,7
@@
#include <linux/device.h>
enum of_gpio_flags;
#include <linux/device.h>
enum of_gpio_flags;
-
+enum gpiod_flags;
struct acpi_device;
/**
struct acpi_device;
/**
@@
-26,7
+26,8
@@
struct acpi_device;
*/
struct acpi_gpio_info {
bool gpioint;
*/
struct acpi_gpio_info {
bool gpioint;
- bool active_low;
+ int polarity;
+ int triggering;
};
/* gpio suffixes used for ACPI and device tree lookup */
};
/* gpio suffixes used for ACPI and device tree lookup */
@@
-47,6
+48,8
@@
struct gpio_desc *acpi_node_get_gpiod(struct fwnode_handle *fwnode,
struct acpi_gpio_info *info);
int acpi_gpio_count(struct device *dev, const char *con_id);
struct acpi_gpio_info *info);
int acpi_gpio_count(struct device *dev, const char *con_id);
+
+bool acpi_can_fallback_to_crs(struct acpi_device *adev, const char *con_id);
#else
static inline void acpi_gpiochip_add(struct gpio_chip *chip) { }
static inline void acpi_gpiochip_remove(struct gpio_chip *chip) { }
#else
static inline void acpi_gpiochip_add(struct gpio_chip *chip) { }
static inline void acpi_gpiochip_remove(struct gpio_chip *chip) { }
@@
-73,6
+76,12
@@
static inline int acpi_gpio_count(struct device *dev, const char *con_id)
{
return -ENODEV;
}
{
return -ENODEV;
}
+
+static inline bool acpi_can_fallback_to_crs(struct acpi_device *adev,
+ const char *con_id)
+{
+ return false;
+}
#endif
struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np,
#endif
struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np,