diff options
author | Greg Kroah-Hartman | 2021-03-15 08:43:49 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2021-03-15 08:43:49 +0100 |
commit | 280def1e1c17d35b21206881937d4498bcc1f503 (patch) | |
tree | 6e40d88144f06dce56338c60073b85b36207f1ef /include/linux/gpio/consumer.h | |
parent | 3d82be8be6fdf38543fa3ae9c35beda4a8a8d067 (diff) | |
parent | 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff) |
Merge 5.12-rc3 into tty-next
Resolves a merge issue with:
drivers/tty/hvc/hvcs.c
and we want the tty/serial fixes from 5.12-rc3 in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/gpio/consumer.h')
-rw-r--r-- | include/linux/gpio/consumer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h index ef49307611d2..c73b25bc9213 100644 --- a/include/linux/gpio/consumer.h +++ b/include/linux/gpio/consumer.h @@ -674,6 +674,8 @@ struct acpi_gpio_mapping { * get GpioIo type explicitly, this quirk may be used. */ #define ACPI_GPIO_QUIRK_ONLY_GPIOIO BIT(1) +/* Use given pin as an absolute GPIO number in the system */ +#define ACPI_GPIO_QUIRK_ABSOLUTE_NUMBER BIT(2) unsigned int quirks; }; |