lkml.org 
[lkml]   [2014]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/7] gpiolib: Support purely name based gpiod lookup in device trees
    Date
    This patch enables gpio-names based gpiod lookup in device tree usage,
    which ignores the index passed to gpiod_get_index. If this fails, fall
    back to the original function-index ("con_id"-gpios) based lookup scheme,
    for backward compatibility and any drivers needing more than one GPIO
    for any function.

    Signed-off-by: Chen-Yu Tsai <wens@csie.org>
    ---
    drivers/gpio/gpiolib.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
    index 761013f..956f01e 100644
    --- a/drivers/gpio/gpiolib.c
    +++ b/drivers/gpio/gpiolib.c
    @@ -2585,8 +2585,13 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
    else
    snprintf(prop_name, 32, "gpios");

    - desc = of_get_named_gpiod_flags(dev->of_node, prop_name, idx,
    - &of_flags);
    + /* try gpio-names based lookup first */
    + desc = of_get_gpiod_flags_by_name(dev->of_node, con_id, &of_flags);
    +
    + /* fallback to function based lookup */
    + if (IS_ERR(desc))
    + desc = of_get_named_gpiod_flags(dev->of_node, prop_name, idx,
    + &of_flags);

    if (IS_ERR(desc))
    return desc;
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-04-15 10:01    [W:3.158 / U:0.900 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site