From: Geert Uytterhoeven <geert+renesas@glider.be> To: Linus Walleij <linus.walleij@linaro.org>, Bartosz Golaszewski <bgolaszewski@baylibre.com>, Jonathan Corbet <corbet@lwn.net>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Harish Jenny K N <harish_kandiga@mentor.com>, Eugeniu Rosca <erosca@de.adit-jv.com> Cc: Alexander Graf <graf@amazon.com>, Peter Maydell <peter.maydell@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Phil Reid <preid@electromag.com.au>, Marc Zyngier <marc.zyngier@arm.com>, Christoffer Dall <christoffer.dall@arm.com>, Magnus Damm <magnus.damm@gmail.com>, linux-gpio@vger.kernel.org, linux-doc@vger.kernel.org, devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, qemu-devel@nongnu.org, Geert Uytterhoeven <geert+renesas@glider.be> Subject: [PATCH v3 2/7] gpiolib: Add support for gpiochipN-based table lookup Date: Wed, 27 Nov 2019 09:42:48 +0100 [thread overview] Message-ID: <20191127084253.16356-3-geert+renesas@glider.be> (raw) In-Reply-To: <20191127084253.16356-1-geert+renesas@glider.be> Currently GPIO controllers can only be referred to by label in GPIO lookup tables. Add support for looking them up by "gpiochipN" name, with "N" either the corresponding GPIO device's ID number, or the GPIO controller's first GPIO number. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- If this is rejected, the GPIO Aggregator documentation must be updated. The second variant is currently used by the legacy sysfs interface only, so perhaps the chip->base check should be dropped? v3: - New. --- drivers/gpio/gpiolib.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index c9e47620d2434983..d24a3d79dcfe69ad 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1746,9 +1746,29 @@ static int gpiochip_match_name(struct gpio_chip *chip, void *data) return !strcmp(chip->label, name); } +static int gpiochip_match_id(struct gpio_chip *chip, void *data) +{ + int id = (uintptr_t)data; + + return id == chip->base || id == chip->gpiodev->id; +} + static struct gpio_chip *find_chip_by_name(const char *name) { - return gpiochip_find((void *)name, gpiochip_match_name); + struct gpio_chip *chip; + int id; + + chip = gpiochip_find((void *)name, gpiochip_match_name); + if (chip) + return chip; + + if (!str_has_prefix(name, GPIOCHIP_NAME)) + return NULL; + + if (kstrtoint(name + strlen(GPIOCHIP_NAME), 10, &id)) + return NULL; + + return gpiochip_find((void *)(uintptr_t)id, gpiochip_match_id); } #ifdef CONFIG_GPIOLIB_IRQCHIP -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Geert Uytterhoeven <geert+renesas@glider.be> To: Linus Walleij <linus.walleij@linaro.org>, Bartosz Golaszewski <bgolaszewski@baylibre.com>, Jonathan Corbet <corbet@lwn.net>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Harish Jenny K N <harish_kandiga@mentor.com>, Eugeniu Rosca <erosca@de.adit-jv.com> Cc: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org, Geert Uytterhoeven <geert+renesas@glider.be>, linux-doc@vger.kernel.org, Marc Zyngier <marc.zyngier@arm.com>, Magnus Damm <magnus.damm@gmail.com>, Christoffer Dall <christoffer.dall@arm.com>, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, Alexander Graf <graf@amazon.com>, Paolo Bonzini <pbonzini@redhat.com>, Phil Reid <preid@electromag.com.au> Subject: [PATCH v3 2/7] gpiolib: Add support for gpiochipN-based table lookup Date: Wed, 27 Nov 2019 09:42:48 +0100 [thread overview] Message-ID: <20191127084253.16356-3-geert+renesas@glider.be> (raw) In-Reply-To: <20191127084253.16356-1-geert+renesas@glider.be> Currently GPIO controllers can only be referred to by label in GPIO lookup tables. Add support for looking them up by "gpiochipN" name, with "N" either the corresponding GPIO device's ID number, or the GPIO controller's first GPIO number. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- If this is rejected, the GPIO Aggregator documentation must be updated. The second variant is currently used by the legacy sysfs interface only, so perhaps the chip->base check should be dropped? v3: - New. --- drivers/gpio/gpiolib.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index c9e47620d2434983..d24a3d79dcfe69ad 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1746,9 +1746,29 @@ static int gpiochip_match_name(struct gpio_chip *chip, void *data) return !strcmp(chip->label, name); } +static int gpiochip_match_id(struct gpio_chip *chip, void *data) +{ + int id = (uintptr_t)data; + + return id == chip->base || id == chip->gpiodev->id; +} + static struct gpio_chip *find_chip_by_name(const char *name) { - return gpiochip_find((void *)name, gpiochip_match_name); + struct gpio_chip *chip; + int id; + + chip = gpiochip_find((void *)name, gpiochip_match_name); + if (chip) + return chip; + + if (!str_has_prefix(name, GPIOCHIP_NAME)) + return NULL; + + if (kstrtoint(name + strlen(GPIOCHIP_NAME), 10, &id)) + return NULL; + + return gpiochip_find((void *)(uintptr_t)id, gpiochip_match_id); } #ifdef CONFIG_GPIOLIB_IRQCHIP -- 2.17.1
next prev parent reply other threads:[~2019-11-27 8:43 UTC|newest] Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-27 8:42 [PATCH v3 0/7] gpio: Add GPIO Aggregator/Repeater Geert Uytterhoeven 2019-11-27 8:42 ` Geert Uytterhoeven 2019-11-27 8:42 ` [PATCH v3 1/7] gpiolib: Add GPIOCHIP_NAME definition Geert Uytterhoeven 2019-11-27 8:42 ` Geert Uytterhoeven 2019-11-28 3:38 ` Ulrich Hecht 2019-11-28 3:38 ` Ulrich Hecht 2019-12-02 21:17 ` Eugeniu Rosca 2019-12-02 21:17 ` Eugeniu Rosca 2019-12-12 10:37 ` Linus Walleij 2019-12-12 10:37 ` Linus Walleij 2019-11-27 8:42 ` Geert Uytterhoeven [this message] 2019-11-27 8:42 ` [PATCH v3 2/7] gpiolib: Add support for gpiochipN-based table lookup Geert Uytterhoeven 2019-11-28 3:38 ` Ulrich Hecht 2019-11-28 3:38 ` Ulrich Hecht 2019-12-12 13:20 ` Linus Walleij 2019-12-12 13:20 ` Linus Walleij 2019-12-12 13:33 ` Geert Uytterhoeven 2019-12-12 13:33 ` Geert Uytterhoeven 2019-12-12 14:36 ` Linus Walleij 2019-12-12 14:36 ` Linus Walleij 2019-11-27 8:42 ` [PATCH v3 3/7] gpiolib: Add support for GPIO line " Geert Uytterhoeven 2019-11-27 8:42 ` Geert Uytterhoeven 2019-11-28 3:39 ` Ulrich Hecht 2019-11-28 3:39 ` Ulrich Hecht 2019-12-12 13:40 ` Linus Walleij 2019-12-12 13:40 ` Linus Walleij 2019-11-27 8:42 ` [PATCH v3 4/7] dt-bindings: gpio: Add gpio-repeater bindings Geert Uytterhoeven 2019-11-27 8:42 ` Geert Uytterhoeven 2019-11-28 3:39 ` Ulrich Hecht 2019-11-28 3:39 ` Ulrich Hecht 2019-12-03 5:51 ` Harish Jenny K N 2019-12-03 5:51 ` Harish Jenny K N 2019-12-05 21:06 ` Rob Herring 2019-12-05 21:06 ` Rob Herring 2019-12-06 9:17 ` Geert Uytterhoeven 2019-12-06 9:17 ` Geert Uytterhoeven 2019-12-06 15:03 ` Rob Herring 2019-12-06 15:03 ` Rob Herring 2020-01-06 8:12 ` Geert Uytterhoeven 2020-01-06 8:12 ` Geert Uytterhoeven 2020-01-07 9:22 ` Harish Jenny K N 2020-01-07 9:22 ` Harish Jenny K N 2020-01-16 5:09 ` Harish Jenny K N 2020-01-16 5:09 ` Harish Jenny K N 2019-11-27 8:42 ` [PATCH v3 5/7] gpio: Add GPIO Aggregator/Repeater driver Geert Uytterhoeven 2019-11-27 8:42 ` Geert Uytterhoeven 2019-11-27 14:15 ` Eugeniu Rosca 2019-11-27 14:15 ` Eugeniu Rosca 2019-11-27 14:33 ` Geert Uytterhoeven 2019-11-27 14:33 ` Geert Uytterhoeven 2019-11-28 3:40 ` Ulrich Hecht 2019-11-28 3:40 ` Ulrich Hecht 2019-12-03 5:42 ` Harish Jenny K N 2019-12-03 5:42 ` Harish Jenny K N 2019-12-03 8:17 ` Geert Uytterhoeven 2019-12-03 8:17 ` Geert Uytterhoeven 2019-12-03 8:51 ` Harish Jenny K N 2019-12-03 8:51 ` Harish Jenny K N 2019-12-03 10:51 ` Eugeniu Rosca 2019-12-03 10:51 ` Eugeniu Rosca 2020-01-09 13:35 ` Geert Uytterhoeven 2020-01-09 13:35 ` Geert Uytterhoeven 2020-01-09 13:49 ` Eugeniu Rosca 2020-01-09 13:49 ` Eugeniu Rosca 2019-12-12 14:34 ` Linus Walleij 2019-12-12 14:34 ` Linus Walleij 2019-12-12 15:24 ` Geert Uytterhoeven 2019-12-12 15:24 ` Geert Uytterhoeven 2020-01-04 0:38 ` Linus Walleij 2020-01-04 0:38 ` Linus Walleij 2020-01-06 8:23 ` Geert Uytterhoeven 2020-01-06 8:23 ` Geert Uytterhoeven 2020-01-08 23:12 ` Linus Walleij 2020-01-08 23:12 ` Linus Walleij 2019-11-27 8:42 ` [PATCH v3 6/7] docs: gpio: Add GPIO Aggregator/Repeater documentation Geert Uytterhoeven 2019-11-27 8:42 ` Geert Uytterhoeven 2019-11-28 3:41 ` Ulrich Hecht 2019-11-28 3:41 ` Ulrich Hecht 2019-12-12 14:42 ` Linus Walleij 2019-12-12 14:42 ` Linus Walleij 2019-12-12 14:48 ` Geert Uytterhoeven 2019-12-12 14:48 ` Geert Uytterhoeven 2020-01-04 0:21 ` Linus Walleij 2020-01-04 0:21 ` Linus Walleij 2020-01-06 8:06 ` Geert Uytterhoeven 2020-01-06 8:06 ` Geert Uytterhoeven 2019-11-27 8:42 ` [PATCH v3 7/7] MAINTAINERS: Add GPIO Aggregator/Repeater section Geert Uytterhoeven 2019-11-27 8:42 ` Geert Uytterhoeven 2019-12-03 5:38 ` Harish Jenny K N 2019-12-03 5:38 ` Harish Jenny K N 2020-01-18 1:46 ` [PATCH v3 0/7] gpio: Add GPIO Aggregator/Repeater Eugeniu Rosca 2020-01-18 1:46 ` Eugeniu Rosca 2020-01-20 9:33 ` Geert Uytterhoeven 2020-01-20 9:33 ` Geert Uytterhoeven 2020-01-20 12:14 ` Eugeniu Rosca 2020-01-20 12:14 ` Eugeniu Rosca
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191127084253.16356-3-geert+renesas@glider.be \ --to=geert+renesas@glider.be \ --cc=bgolaszewski@baylibre.com \ --cc=christoffer.dall@arm.com \ --cc=corbet@lwn.net \ --cc=devicetree@vger.kernel.org \ --cc=erosca@de.adit-jv.com \ --cc=graf@amazon.com \ --cc=harish_kandiga@mentor.com \ --cc=linus.walleij@linaro.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=magnus.damm@gmail.com \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=pbonzini@redhat.com \ --cc=peter.maydell@linaro.org \ --cc=preid@electromag.com.au \ --cc=qemu-devel@nongnu.org \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.