system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-10 05:16:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

gpio: Break out code to get a descriptor from a DT node

Browse source 
Sometimes a GPIO needs to be taken from a node without
a device associated with it. The fwnode accessor does this,
let's however break out the DT code for now.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2017-12-29 02:07:54 +01:00
parent 6a537d4846
commit 6392cca42d
1 changed files with 88 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
drivers/gpio/gpiolib.c
View file

@ -3668,65 +3668,48 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev,
EXPORT_SYMBOL_GPL(gpiod_get_index); EXPORT_SYMBOL_GPL(gpiod_get_index);
/** /**
* fwnode_get_named_gpiod - obtain a GPIO from firmware node * gpiod_get_from_of_node() - obtain a GPIO from an OF node
* @fwnode: handle of the firmware node * @node: handle of the OF node
* @propname: name of the firmware property representing the GPIO * @propname: name of the DT property representing the GPIO
* @index: index of the GPIO to obtain in the consumer * @index: index of the GPIO to obtain for the consumer
* @dflags: GPIO initialization flags * @dflags: GPIO initialization flags
* @label: label to attach to the requested GPIO * @label: label to attach to the requested GPIO
* *
* This function can be used for drivers that get their configuration
* from firmware.
*
* Function properly finds the corresponding GPIO using whatever is the
* underlying firmware interface and then makes sure that the GPIO
* descriptor is requested before it is returned to the caller.
*
* Returns: * Returns:
* On successful request the GPIO pin is configured in accordance with * On successful request the GPIO pin is configured in accordance with
* provided @dflags. * provided @dflags. If the node does not have the requested GPIO
* property, NULL is returned.
* *
* 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, static struct gpio_desc *gpiod_get_from_of_node(struct device_node *node,
const char *propname, int index, const char *propname, int index,
enum gpiod_flags dflags, enum gpiod_flags dflags,
const char *label) const char *label)
{ {
struct gpio_desc *desc = ERR_PTR(-ENODEV); struct gpio_desc *desc = ERR_PTR(-ENODEV);
unsigned long lflags = 0; unsigned long lflags = 0;
enum of_gpio_flags flags;
bool active_low = false; bool active_low = false;
bool single_ended = false; bool single_ended = false;
bool open_drain = false; bool open_drain = false;
bool transitory = false; bool transitory = false;
int ret; int ret;
if (!fwnode) desc = of_get_named_gpiod_flags(node, propname,
return ERR_PTR(-EINVAL); index, &flags);
if (is_of_node(fwnode)) { if (!desc || IS_ERR(desc)) {
enum of_gpio_flags flags; /* If it is not there, just return NULL */
if (PTR_ERR(desc) == -ENOENT)
desc = of_get_named_gpiod_flags(to_of_node(fwnode), propname, return NULL;
index, &flags); return desc;
if (!IS_ERR(desc)) {
active_low = flags & OF_GPIO_ACTIVE_LOW;
single_ended = flags & OF_GPIO_SINGLE_ENDED;
open_drain = flags & OF_GPIO_OPEN_DRAIN;
transitory = flags & OF_GPIO_TRANSITORY;
}
} else if (is_acpi_node(fwnode)) {
struct acpi_gpio_info info;
desc = acpi_node_get_gpiod(fwnode, propname, index, &info);
if (!IS_ERR(desc)) {
active_low = info.polarity == GPIO_ACTIVE_LOW;
acpi_gpio_update_gpiod_flags(&dflags, &info);
}
} }
if (IS_ERR(desc)) active_low = flags & OF_GPIO_ACTIVE_LOW;
return desc; single_ended = flags & OF_GPIO_SINGLE_ENDED;
open_drain = flags & OF_GPIO_OPEN_DRAIN;
transitory = flags & OF_GPIO_TRANSITORY;
ret = gpiod_request(desc, label); ret = gpiod_request(desc, label);
if (ret) if (ret)
@ -3753,6 +3736,72 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
return desc; return desc;
} }
/**
* fwnode_get_named_gpiod - obtain a GPIO from firmware node
* @fwnode: handle of the firmware node
* @propname: name of the firmware property representing the GPIO
* @index: index of the GPIO to obtain for the consumer
* @dflags: GPIO initialization flags
* @label: label to attach to the requested GPIO
*
* This function can be used for drivers that get their configuration
* from opaque firmware.
*
* The function properly finds the corresponding GPIO using whatever is the
* underlying firmware interface and then makes sure that the GPIO
* descriptor is requested before it is returned to the caller.
*
* Returns:
* On successful request the GPIO pin is configured in accordance with
* provided @dflags.
*
* In case of error an ERR_PTR() is returned.
*/
struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
const char *propname, int index,
enum gpiod_flags dflags,
const char *label)
{
struct gpio_desc *desc = ERR_PTR(-ENODEV);
unsigned long lflags = 0;
int ret;
if (!fwnode)
return ERR_PTR(-EINVAL);
if (is_of_node(fwnode)) {
desc = gpiod_get_from_of_node(to_of_node(fwnode),
propname, index,
dflags,
label);
return desc;
} else if (is_acpi_node(fwnode)) {
struct acpi_gpio_info info;
desc = acpi_node_get_gpiod(fwnode, propname, index, &info);
if (IS_ERR(desc))
return desc;
acpi_gpio_update_gpiod_flags(&dflags, &info);
if (info.polarity == GPIO_ACTIVE_LOW)
lflags |= GPIO_ACTIVE_LOW;
}
/* Currently only ACPI takes this path */
ret = gpiod_request(desc, label);
if (ret)
return ERR_PTR(ret);
ret = gpiod_configure_flags(desc, propname, lflags, dflags);
if (ret < 0) {
gpiod_put(desc);
return ERR_PTR(ret);
}
return desc;
}
EXPORT_SYMBOL_GPL(fwnode_get_named_gpiod); EXPORT_SYMBOL_GPL(fwnode_get_named_gpiod);
/** /**