|
@@ -21,6 +21,8 @@
|
|
|
#include <linux/device.h>
|
|
|
#include <linux/gfp.h>
|
|
|
|
|
|
+#include "gpiolib.h"
|
|
|
+
|
|
|
static void devm_gpiod_release(struct device *dev, void *res)
|
|
|
{
|
|
|
struct gpio_desc **desc = res;
|
|
@@ -135,7 +137,6 @@ struct gpio_desc *devm_get_gpiod_from_child(struct device *dev,
|
|
|
const char *con_id,
|
|
|
struct fwnode_handle *child)
|
|
|
{
|
|
|
- static const char * const suffixes[] = { "gpios", "gpio" };
|
|
|
char prop_name[32]; /* 32 is max size of property name */
|
|
|
struct gpio_desc **dr;
|
|
|
struct gpio_desc *desc;
|
|
@@ -146,13 +147,13 @@ struct gpio_desc *devm_get_gpiod_from_child(struct device *dev,
|
|
|
if (!dr)
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
|
- for (i = 0; i < ARRAY_SIZE(suffixes); i++) {
|
|
|
+ for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
|
|
|
if (con_id)
|
|
|
snprintf(prop_name, sizeof(prop_name), "%s-%s",
|
|
|
- con_id, suffixes[i]);
|
|
|
+ con_id, gpio_suffixes[i]);
|
|
|
else
|
|
|
snprintf(prop_name, sizeof(prop_name), "%s",
|
|
|
- suffixes[i]);
|
|
|
+ gpio_suffixes[i]);
|
|
|
|
|
|
desc = fwnode_get_named_gpiod(child, prop_name);
|
|
|
if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT))
|