linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH 01/11] gpiolib: of: add a fallback for wlf,reset GPIO name
Date: Wed, 11 Sep 2019 00:52:05 -0700	[thread overview]
Message-ID: <20190911075215.78047-2-dmitry.torokhov@gmail.com> (raw)
In-Reply-To: <20190911075215.78047-1-dmitry.torokhov@gmail.com>

The old Arizona binding did not use -gpio or -gpios suffix, so
devm_gpiod_get() does not work for it. As it is the one of a few users
of devm_gpiod_get_from_of_node() API that I want to remove, I'd rather
have a small quirk in the gpiolib OF handler, and switch Arizona
driver to devm_gpiod_get().

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

 drivers/gpio/gpiolib-of.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index b45b39c48a34..8b773f7d7724 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -438,6 +438,19 @@ static struct gpio_desc *of_find_regulator_gpio(struct device *dev, const char *
 	return desc;
 }
 
+static struct gpio_desc *of_find_arizona_gpio(struct device *dev,
+					      const char *con_id,
+					      enum of_gpio_flags *of_flags)
+{
+	if (!IS_ENABLED(CONFIG_MFD_ARIZONA))
+		return ERR_PTR(-ENOENT);
+
+	if (!con_id || strcmp(con_id, "wlf,reset"))
+		return ERR_PTR(-ENOENT);
+
+	return of_get_named_gpiod_flags(dev->of_node, con_id, 0, of_flags);
+}
+
 struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
 			       unsigned int idx, unsigned long *flags)
 {
@@ -479,6 +492,9 @@ struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
 		desc = of_find_regulator_gpio(dev, con_id, &of_flags);
 	}
 
+	if (IS_ERR(desc) && PTR_ERR(desc) == -ENOENT)
+		desc = of_find_arizona_gpio(dev, con_id, &of_flags);
+
 	if (IS_ERR(desc))
 		return desc;
 
-- 
2.23.0.162.g0b9fbb3734-goog


  reply	other threads:[~2019-09-11  7:52 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-11  7:52 [PATCH 00/11] Add support for software nodes to gpiolib Dmitry Torokhov
2019-09-11  7:52 ` Dmitry Torokhov [this message]
2019-09-12  9:30   ` [PATCH 01/11] gpiolib: of: add a fallback for wlf,reset GPIO name Linus Walleij
2019-09-11  7:52 ` [PATCH 02/11] gpiolib: introduce devm_fwnode_gpiod_get_index() Dmitry Torokhov
2019-09-11 17:01   ` Andy Shevchenko
2019-09-12  9:35     ` Linus Walleij
2019-09-12  9:48   ` Linus Walleij
2019-09-13 18:14     ` Dmitry Torokhov
2019-09-11  7:52 ` [PATCH 03/11] gpiolib: introduce fwnode_gpiod_get_index() Dmitry Torokhov
2019-09-12  9:50   ` Linus Walleij
2019-09-11  7:52 ` [PATCH 04/11] net: phylink: switch to using fwnode_gpiod_get_index() Dmitry Torokhov
2019-09-11  9:25   ` Andy Shevchenko
2019-09-11  9:39     ` Russell King - ARM Linux admin
2019-09-11  9:46       ` Andy Shevchenko
2019-09-11  9:49         ` Russell King - ARM Linux admin
2019-09-11  9:55           ` Dmitry Torokhov
2019-09-11 10:10             ` Russell King - ARM Linux admin
2019-09-11 16:52               ` Andy Shevchenko
2019-09-11  9:51         ` Dmitry Torokhov
2019-09-12  9:41           ` Linus Walleij
2019-09-12 13:44             ` Andy Shevchenko
2019-09-12 13:52               ` Russell King - ARM Linux admin
2019-09-11  7:52 ` [PATCH 05/11] net: mdio: " Dmitry Torokhov
2019-09-11  7:52 ` [PATCH 06/11] drm/bridge: ti-tfp410: " Dmitry Torokhov
2019-09-20 23:12   ` Laurent Pinchart
2019-09-23 15:03     ` Heikki Krogerus
2019-09-23 16:00       ` Laurent Pinchart
2019-09-11  7:52 ` [PATCH 07/11] gpliolib: make fwnode_get_named_gpiod() static Dmitry Torokhov
2019-09-11  7:52 ` [PATCH 08/11] gpiolib: of: tease apart of_find_gpio() Dmitry Torokhov
2019-09-11 17:10   ` Andy Shevchenko
2019-09-11  7:52 ` [PATCH 09/11] gpiolib: of: tease apart acpi_find_gpio() Dmitry Torokhov
2019-09-11 17:12   ` Andy Shevchenko
2019-09-11  7:52 ` [PATCH 10/11] gpiolib: consolidate fwnode GPIO lookups Dmitry Torokhov
2019-09-11  7:52 ` [PATCH 11/11] gpiolib: add support for software nodes Dmitry Torokhov
2019-09-11 17:13 ` [PATCH 00/11] Add support for software nodes to gpiolib Andy Shevchenko
2019-09-12  9:55 ` Linus Walleij
2019-09-17  0:22   ` Dmitry Torokhov
2019-09-30 22:44     ` Dmitry Torokhov
2019-10-04 21:44       ` Linus Walleij

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=20190911075215.78047-2-dmitry.torokhov@gmail.com \
    --to=dmitry.torokhov@gmail.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=bgolaszewski@baylibre.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mika.westerberg@linux.intel.com \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).