lkml.org 
[lkml]   [2021]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 075/120] gpiolib: Assign fwnode to parents if no primary one provided
    Date
    From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

    [ Upstream commit 6cb59afe9e5b45a035bd6b97da6593743feefc72 ]

    In case when the properties are supplied in the secondary fwnode
    (for example, built-in device properties) the fwnode pointer left
    unassigned. This makes unable to retrieve them.

    Assign fwnode to parent's if no primary one provided.

    Fixes: 7cba1a4d5e16 ("gpiolib: generalize devprop_gpiochip_set_names() for device properties")
    Fixes: 2afa97e9868f ("gpiolib: Read "gpio-line-names" from a firmware node")
    Reported-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
    Tested-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpio/gpiolib.c | 7 +++++++
    1 file changed, 7 insertions(+)

    diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
    index e4cfa27f6893..a4a47305574c 100644
    --- a/drivers/gpio/gpiolib.c
    +++ b/drivers/gpio/gpiolib.c
    @@ -573,6 +573,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,
    struct lock_class_key *lock_key,
    struct lock_class_key *request_key)
    {
    + struct fwnode_handle *fwnode = gc->parent ? dev_fwnode(gc->parent) : NULL;
    unsigned long flags;
    int ret = 0;
    unsigned i;
    @@ -602,6 +603,12 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,
    gc->of_node = gdev->dev.of_node;
    #endif

    + /*
    + * Assign fwnode depending on the result of the previous calls,
    + * if none of them succeed, assign it to the parent's one.
    + */
    + gdev->dev.fwnode = dev_fwnode(&gdev->dev) ?: fwnode;
    +
    gdev->id = ida_alloc(&gpio_ida, GFP_KERNEL);
    if (gdev->id < 0) {
    ret = gdev->id;
    --
    2.30.1


    \
     
     \ /
      Last update: 2021-03-22 13:44    [W:4.051 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site