Commit 9e66504a authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij

gpio: acpi: Align acpi_find_gpio() with DT version

By some reason acpi_find_gpio() and acpi_gpio_count() have compared
connection ID to "gpios" when tries to check if suffix is needed or not.

Don't do any assumptions about what connection ID can be and, when defined,
use it only with suffix as it's done in the device tree version.
Reviewed-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c29fd9eb
...@@ -599,7 +599,7 @@ struct gpio_desc *acpi_find_gpio(struct device *dev, ...@@ -599,7 +599,7 @@ struct gpio_desc *acpi_find_gpio(struct device *dev,
/* Try first from _DSD */ /* Try first from _DSD */
for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) { for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
if (con_id && strcmp(con_id, "gpios")) { if (con_id) {
snprintf(propname, sizeof(propname), "%s-%s", snprintf(propname, sizeof(propname), "%s-%s",
con_id, gpio_suffixes[i]); con_id, gpio_suffixes[i]);
} else { } else {
...@@ -1089,7 +1089,7 @@ int acpi_gpio_count(struct device *dev, const char *con_id) ...@@ -1089,7 +1089,7 @@ int acpi_gpio_count(struct device *dev, const char *con_id)
/* Try first from _DSD */ /* Try first from _DSD */
for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) { for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
if (con_id && strcmp(con_id, "gpios")) if (con_id)
snprintf(propname, sizeof(propname), "%s-%s", snprintf(propname, sizeof(propname), "%s-%s",
con_id, gpio_suffixes[i]); con_id, gpio_suffixes[i]);
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment