mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
gpiolib: acpi: Assign polarity when call acpi_populate_gpio_lookup()
There is no need, since we preserve firmware settings, to override polarity for GpioInt() resources. While Documentation/gpio-properties.txt refers to any from GpioIo() / GpioInt() resources, the active_low flag has been introduced to fill the gap only for GpioIo() which lacks of that information. Moreover, in case of GpioInt() existed solution was broken anyway, it overrides only in one direction, i.e. from 0 to 1, otherwise it would be still 1 as defined in the resource macro. So, move the assignment to a right place and forbid to (semi-)override polarity for GpioInt() type of resources. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
4fbd8d194f
commit
f67a6c11f9
1 changed files with 2 additions and 5 deletions
|
@ -531,8 +531,8 @@ static int acpi_populate_gpio_lookup(struct acpi_resource *ares, void *data)
|
|||
lookup->info.triggering = agpio->triggering;
|
||||
} else {
|
||||
lookup->info.flags = acpi_gpio_to_gpiod_flags(agpio);
|
||||
lookup->info.polarity = lookup->active_low;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
@ -557,11 +557,8 @@ static int acpi_gpio_resource_lookup(struct acpi_gpio_lookup *lookup,
|
|||
if (!lookup->desc)
|
||||
return -ENOENT;
|
||||
|
||||
if (info) {
|
||||
if (info)
|
||||
*info = lookup->info;
|
||||
if (lookup->active_low)
|
||||
info->polarity = lookup->active_low;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue