GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-17 03:58:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ib-gpiod-flags' into devel

Browse source
This commit is contained in:
Linus Walleij 2017-02-05 23:14:23 +01:00
commit e4df1ebdfe
7 changed files with 58 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/gpio/devres.c
View file

@ -125,9 +125,11 @@ struct gpio_desc *__must_check devm_gpiod_get_index(struct device *dev,
EXPORT_SYMBOL(devm_gpiod_get_index); EXPORT_SYMBOL(devm_gpiod_get_index);
/** /**
* devm_get_gpiod_from_child - get a GPIO descriptor from a device's child node * devm_fwnode_get_index_gpiod_from_child - get a GPIO descriptor from a
* device's child node
* @dev: GPIO consumer * @dev: GPIO consumer
* @con_id: function within the GPIO consumer * @con_id: function within the GPIO consumer
* @index: index of the GPIO to obtain in the consumer
* @child: firmware node (child of @dev) * @child: firmware node (child of @dev)
* @flags: GPIO initialization flags * @flags: GPIO initialization flags
* *
@ -137,11 +139,11 @@ EXPORT_SYMBOL(devm_gpiod_get_index);
* On successfull request the GPIO pin is configured in accordance with * On successfull request the GPIO pin is configured in accordance with
* provided @flags. * provided @flags.
*/ */
struct gpio_desc *devm_get_gpiod_from_child(struct device *dev, struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
const char *con_id, const char *con_id, int index,
struct fwnode_handle *child, struct fwnode_handle *child,
enum gpiod_flags flags, enum gpiod_flags flags,
const char *label) const char *label)
{ {
char prop_name[32]; /* 32 is max size of property name */ char prop_name[32]; /* 32 is max size of property name */
struct gpio_desc **dr; struct gpio_desc **dr;
@ -161,7 +163,8 @@ struct gpio_desc *devm_get_gpiod_from_child(struct device *dev,
snprintf(prop_name, sizeof(prop_name), "%s", snprintf(prop_name, sizeof(prop_name), "%s",
gpio_suffixes[i]); gpio_suffixes[i]);
desc = fwnode_get_named_gpiod(child, prop_name, flags, label); desc = fwnode_get_named_gpiod(child, prop_name, index, flags,
label);
if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT)) if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT))
break; break;
} }
@ -175,7 +178,7 @@ struct gpio_desc *devm_get_gpiod_from_child(struct device *dev,
return desc; return desc;
} }
EXPORT_SYMBOL(devm_get_gpiod_from_child); EXPORT_SYMBOL(devm_fwnode_get_index_gpiod_from_child);
/** /**
* devm_gpiod_get_index_optional - Resource-managed gpiod_get_index_optional() * devm_gpiod_get_index_optional - Resource-managed gpiod_get_index_optional()

9
drivers/gpio/gpiolib.c
View file

@ -3316,6 +3316,7 @@ EXPORT_SYMBOL_GPL(gpiod_get_index);
* fwnode_get_named_gpiod - obtain a GPIO from firmware node * fwnode_get_named_gpiod - obtain a GPIO from firmware node
* @fwnode: handle of the firmware node * @fwnode: handle of the firmware node
* @propname: name of the firmware property representing the GPIO * @propname: name of the firmware property representing the GPIO
* @index: index of the GPIO to obtain in the consumer
* @dflags: GPIO initialization flags * @dflags: GPIO initialization flags
* *
* This function can be used for drivers that get their configuration * This function can be used for drivers that get their configuration
@ -3331,7 +3332,7 @@ EXPORT_SYMBOL_GPL(gpiod_get_index);
* In case of error an ERR_PTR() is returned. * In case of error an ERR_PTR() is returned.
*/ */
struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode, struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
const char *propname, const char *propname, int index,
enum gpiod_flags dflags, enum gpiod_flags dflags,
const char *label) const char *label)
{ {
@ -3347,8 +3348,8 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
if (is_of_node(fwnode)) { if (is_of_node(fwnode)) {
enum of_gpio_flags flags; enum of_gpio_flags flags;
desc = of_get_named_gpiod_flags(to_of_node(fwnode), propname, 0, desc = of_get_named_gpiod_flags(to_of_node(fwnode), propname,
&flags); index, &flags);
if (!IS_ERR(desc)) { if (!IS_ERR(desc)) {
active_low = flags & OF_GPIO_ACTIVE_LOW; active_low = flags & OF_GPIO_ACTIVE_LOW;
single_ended = flags & OF_GPIO_SINGLE_ENDED; single_ended = flags & OF_GPIO_SINGLE_ENDED;
@ -3356,7 +3357,7 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
} else if (is_acpi_node(fwnode)) { } else if (is_acpi_node(fwnode)) {
struct acpi_gpio_info info; struct acpi_gpio_info info;
desc = acpi_node_get_gpiod(fwnode, propname, 0, &info); desc = acpi_node_get_gpiod(fwnode, propname, index, &info);
if (!IS_ERR(desc)) if (!IS_ERR(desc))
active_low = info.polarity == GPIO_ACTIVE_LOW; active_low = info.polarity == GPIO_ACTIVE_LOW;
} }

6
drivers/input/keyboard/gpio_keys.c
View file

@ -481,8 +481,10 @@ static int gpio_keys_setup_key(struct platform_device *pdev,
spin_lock_init(&bdata->lock); spin_lock_init(&bdata->lock);
if (child) { if (child) {
bdata->gpiod = devm_get_gpiod_from_child(dev, NULL, child, bdata->gpiod = devm_fwnode_get_gpiod_from_child(dev, NULL,
GPIOD_IN, desc); child,
GPIOD_IN,
desc);
if (IS_ERR(bdata->gpiod)) { if (IS_ERR(bdata->gpiod)) {
error = PTR_ERR(bdata->gpiod); error = PTR_ERR(bdata->gpiod);
if (error == -ENOENT) { if (error == -ENOENT) {

8
drivers/input/keyboard/gpio_keys_polled.c
View file

@ -303,10 +303,10 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
bdata->gpiod = devm_get_gpiod_from_child(dev, NULL, bdata->gpiod = devm_fwnode_get_gpiod_from_child(dev,
child, NULL, child,
GPIOD_IN, GPIOD_IN,
button->desc); button->desc);
if (IS_ERR(bdata->gpiod)) { if (IS_ERR(bdata->gpiod)) {
error = PTR_ERR(bdata->gpiod); error = PTR_ERR(bdata->gpiod);
if (error != -EPROBE_DEFER) if (error != -EPROBE_DEFER)

5
drivers/leds/leds-gpio.c
View file

@ -182,8 +182,9 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
led.gpiod = devm_get_gpiod_from_child(dev, NULL, child, led.gpiod = devm_fwnode_get_gpiod_from_child(dev, NULL, child,
GPIOD_ASIS, led.name); GPIOD_ASIS,
led.name);
if (IS_ERR(led.gpiod)) { if (IS_ERR(led.gpiod)) {
fwnode_handle_put(child); fwnode_handle_put(child);
return ERR_CAST(led.gpiod); return ERR_CAST(led.gpiod);

16
drivers/video/fbdev/amba-clcd-nomadik.c
View file

@ -185,26 +185,26 @@ static void tpg110_init(struct device *dev, struct device_node *np,
dev_info(dev, "TPG110 display init\n"); dev_info(dev, "TPG110 display init\n");
/* This asserts the GRESTB signal, putting the display into reset */ /* This asserts the GRESTB signal, putting the display into reset */
grestb = devm_get_gpiod_from_child(dev, "grestb", &np->fwnode, grestb = devm_fwnode_get_gpiod_from_child(dev, "grestb", &np->fwnode,
GPIOD_OUT_HIGH, "grestb"); GPIOD_OUT_HIGH, "grestb");
if (IS_ERR(grestb)) { if (IS_ERR(grestb)) {
dev_err(dev, "no GRESTB GPIO\n"); dev_err(dev, "no GRESTB GPIO\n");
return; return;
} }
scen = devm_get_gpiod_from_child(dev, "scen", &np->fwnode, scen = devm_fwnode_get_gpiod_from_child(dev, "scen", &np->fwnode,
GPIOD_OUT_LOW, "scen"); GPIOD_OUT_LOW, "scen");
if (IS_ERR(scen)) { if (IS_ERR(scen)) {
dev_err(dev, "no SCEN GPIO\n"); dev_err(dev, "no SCEN GPIO\n");
return; return;
} }
scl = devm_get_gpiod_from_child(dev, "scl", &np->fwnode, GPIOD_OUT_LOW, scl = devm_fwnode_get_gpiod_from_child(dev, "scl", &np->fwnode,
"scl"); GPIOD_OUT_LOW, "scl");
if (IS_ERR(scl)) { if (IS_ERR(scl)) {
dev_err(dev, "no SCL GPIO\n"); dev_err(dev, "no SCL GPIO\n");
return; return;
} }
sda = devm_get_gpiod_from_child(dev, "sda", &np->fwnode, GPIOD_OUT_LOW, sda = devm_fwnode_get_gpiod_from_child(dev, "sda", &np->fwnode,
"sda"); GPIOD_OUT_LOW, "sda");
if (IS_ERR(sda)) { if (IS_ERR(sda)) {
dev_err(dev, "no SDA GPIO\n"); dev_err(dev, "no SDA GPIO\n");
return; return;

35
include/linux/gpio/consumer.h
View file

@ -135,14 +135,14 @@ int desc_to_gpio(const struct gpio_desc *desc);
struct fwnode_handle; struct fwnode_handle;
struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode, struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
const char *propname, const char *propname, int index,
enum gpiod_flags dflags, enum gpiod_flags dflags,
const char *label); const char *label);
struct gpio_desc *devm_get_gpiod_from_child(struct device *dev, struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
const char *con_id, const char *con_id, int index,
struct fwnode_handle *child, struct fwnode_handle *child,
enum gpiod_flags flags, enum gpiod_flags flags,
const char *label); const char *label);
#else /* CONFIG_GPIOLIB */ #else /* CONFIG_GPIOLIB */
static inline int gpiod_count(struct device *dev, const char *con_id) static inline int gpiod_count(struct device *dev, const char *con_id)
@ -417,7 +417,7 @@ struct fwnode_handle;
static inline static inline
struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode, struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
const char *propname, const char *propname, int index,
enum gpiod_flags dflags, enum gpiod_flags dflags,
const char *label) const char *label)
{ {
@ -425,17 +425,28 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
} }
static inline static inline
struct gpio_desc *devm_get_gpiod_from_child(struct device *dev, struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
const char *con_id, const char *con_id, int index,
struct fwnode_handle *child, struct fwnode_handle *child,
enum gpiod_flags flags, enum gpiod_flags flags,
const char *label) const char *label)
{ {
return ERR_PTR(-ENOSYS); return ERR_PTR(-ENOSYS);
} }
#endif /* CONFIG_GPIOLIB */ #endif /* CONFIG_GPIOLIB */
static inline
struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,
const char *con_id,
struct fwnode_handle *child,
enum gpiod_flags flags,
const char *label)
{
return devm_fwnode_get_index_gpiod_from_child(dev, con_id, 0, child,
flags, label);
}
#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS) #if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS)
int gpiod_export(struct gpio_desc *desc, bool direction_may_change); int gpiod_export(struct gpio_desc *desc, bool direction_may_change);