|
@@ -119,20 +119,20 @@ int of_get_named_gpio_flags(struct device_node *np, const char *list_name,
|
|
EXPORT_SYMBOL(of_get_named_gpio_flags);
|
|
EXPORT_SYMBOL(of_get_named_gpio_flags);
|
|
|
|
|
|
/**
|
|
/**
|
|
- * of_get_gpio_hog() - Get a GPIO hog descriptor, names and flags for GPIO API
|
|
|
|
|
|
+ * of_parse_own_gpio() - Get a GPIO hog descriptor, names and flags for GPIO API
|
|
* @np: device node to get GPIO from
|
|
* @np: device node to get GPIO from
|
|
* @name: GPIO line name
|
|
* @name: GPIO line name
|
|
* @lflags: gpio_lookup_flags - returned from of_find_gpio() or
|
|
* @lflags: gpio_lookup_flags - returned from of_find_gpio() or
|
|
- * of_get_gpio_hog()
|
|
|
|
|
|
+ * of_parse_own_gpio()
|
|
* @dflags: gpiod_flags - optional GPIO initialization flags
|
|
* @dflags: gpiod_flags - optional GPIO initialization flags
|
|
*
|
|
*
|
|
* Returns GPIO descriptor to use with Linux GPIO API, or one of the errno
|
|
* Returns GPIO descriptor to use with Linux GPIO API, or one of the errno
|
|
* value on the error condition.
|
|
* value on the error condition.
|
|
*/
|
|
*/
|
|
-static struct gpio_desc *of_get_gpio_hog(struct device_node *np,
|
|
|
|
- const char **name,
|
|
|
|
- enum gpio_lookup_flags *lflags,
|
|
|
|
- enum gpiod_flags *dflags)
|
|
|
|
|
|
+static struct gpio_desc *of_parse_own_gpio(struct device_node *np,
|
|
|
|
+ const char **name,
|
|
|
|
+ enum gpio_lookup_flags *lflags,
|
|
|
|
+ enum gpiod_flags *dflags)
|
|
{
|
|
{
|
|
struct device_node *chip_np;
|
|
struct device_node *chip_np;
|
|
enum of_gpio_flags xlate_flags;
|
|
enum of_gpio_flags xlate_flags;
|
|
@@ -196,13 +196,13 @@ static struct gpio_desc *of_get_gpio_hog(struct device_node *np,
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * of_gpiochip_scan_hogs - Scan gpio-controller and apply GPIO hog as requested
|
|
|
|
|
|
+ * of_gpiochip_scan_gpios - Scan gpio-controller for gpio definitions
|
|
* @chip: gpio chip to act on
|
|
* @chip: gpio chip to act on
|
|
*
|
|
*
|
|
* This is only used by of_gpiochip_add to request/set GPIO initial
|
|
* This is only used by of_gpiochip_add to request/set GPIO initial
|
|
* configuration.
|
|
* configuration.
|
|
*/
|
|
*/
|
|
-static void of_gpiochip_scan_hogs(struct gpio_chip *chip)
|
|
|
|
|
|
+static void of_gpiochip_scan_gpios(struct gpio_chip *chip)
|
|
{
|
|
{
|
|
struct gpio_desc *desc = NULL;
|
|
struct gpio_desc *desc = NULL;
|
|
struct device_node *np;
|
|
struct device_node *np;
|
|
@@ -214,7 +214,7 @@ static void of_gpiochip_scan_hogs(struct gpio_chip *chip)
|
|
if (!of_property_read_bool(np, "gpio-hog"))
|
|
if (!of_property_read_bool(np, "gpio-hog"))
|
|
continue;
|
|
continue;
|
|
|
|
|
|
- desc = of_get_gpio_hog(np, &name, &lflags, &dflags);
|
|
|
|
|
|
+ desc = of_parse_own_gpio(np, &name, &lflags, &dflags);
|
|
if (IS_ERR(desc))
|
|
if (IS_ERR(desc))
|
|
continue;
|
|
continue;
|
|
|
|
|
|
@@ -440,7 +440,7 @@ int of_gpiochip_add(struct gpio_chip *chip)
|
|
|
|
|
|
of_node_get(chip->of_node);
|
|
of_node_get(chip->of_node);
|
|
|
|
|
|
- of_gpiochip_scan_hogs(chip);
|
|
|
|
|
|
+ of_gpiochip_scan_gpios(chip);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|