From: Linus Walleij <linus.walleij@linaro.org>
To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>
Cc: linux-kernel@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org>
Subject: [PATCH 06/18 v2] regulator: lm363x: Pass descriptor instead of GPIO number
Date: Mon, 23 Apr 2018 01:07:30 +0200 [thread overview]
Message-ID: <20180422230742.3729-6-linus.walleij@linaro.org> (raw)
In-Reply-To: <20180422230742.3729-1-linus.walleij@linaro.org>
Instead of passing a global GPIO number, pass a descriptor looked
up with the standard devm_gpiod_get_index_optional() call.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v1->v2:
- Rebase the patch on the other changes.
---
drivers/regulator/lm363x-regulator.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/regulator/lm363x-regulator.c b/drivers/regulator/lm363x-regulator.c
index ce5f7d9ad475..b615a413ca9f 100644
--- a/drivers/regulator/lm363x-regulator.c
+++ b/drivers/regulator/lm363x-regulator.c
@@ -16,7 +16,7 @@
#include <linux/mfd/ti-lmu-register.h>
#include <linux/module.h>
#include <linux/of.h>
-#include <linux/of_gpio.h>
+#include <linux/gpio/consumer.h>
#include <linux/platform_device.h>
#include <linux/regulator/driver.h>
#include <linux/regulator/of_regulator.h>
@@ -219,7 +219,7 @@ static const struct regulator_desc lm363x_regulator_desc[] = {
},
};
-static int lm363x_regulator_of_get_enable_gpio(struct device_node *np, int id)
+static struct gpio_desc *lm363x_regulator_of_get_enable_gpio(struct device *dev, int id)
{
/*
* Check LCM_EN1/2_GPIO is configured.
@@ -227,11 +227,11 @@ static int lm363x_regulator_of_get_enable_gpio(struct device_node *np, int id)
*/
switch (id) {
case LM3632_LDO_POS:
- return of_get_named_gpio(np, "enable-gpios", 0);
+ return devm_gpiod_get_index_optional(dev, "enable", 0, GPIOD_OUT_LOW);
case LM3632_LDO_NEG:
- return of_get_named_gpio(np, "enable-gpios", 1);
+ return devm_gpiod_get_index_optional(dev, "enable", 1, GPIOD_OUT_LOW);
default:
- return -EINVAL;
+ return NULL;
}
}
@@ -243,7 +243,8 @@ static int lm363x_regulator_probe(struct platform_device *pdev)
struct regulator_dev *rdev;
struct device *dev = &pdev->dev;
int id = pdev->id;
- int ret, ena_gpio;
+ struct gpio_desc *gpiod;
+ int ret;
cfg.dev = dev;
cfg.regmap = regmap;
@@ -252,10 +253,9 @@ static int lm363x_regulator_probe(struct platform_device *pdev)
* LM3632 LDOs can be controlled by external pin.
* Register update is required if the pin is used.
*/
- ena_gpio = lm363x_regulator_of_get_enable_gpio(dev->of_node, id);
- if (gpio_is_valid(ena_gpio)) {
- cfg.ena_gpio = ena_gpio;
- cfg.ena_gpio_flags = GPIOF_OUT_INIT_LOW;
+ gpiod = lm363x_regulator_of_get_enable_gpio(dev, id);
+ if (gpiod) {
+ cfg.ena_gpiod = gpiod;
ret = regmap_update_bits(regmap, LM3632_REG_BIAS_CONFIG,
LM3632_EXT_EN_MASK,
--
2.14.3
next prev parent reply other threads:[~2018-04-22 23:10 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-22 23:07 [PATCH 01/18 v2] regulator: fixed: Convert to use GPIO descriptor only Linus Walleij
2018-04-22 23:07 ` [PATCH 02/18 v2] regulator: gpio: Get enable GPIO using GPIO descriptor Linus Walleij
2018-04-22 23:07 ` [PATCH 03/18 v2] regulator: arizona-ldo1: Look up a descriptor and pass to the core Linus Walleij
2018-04-23 8:48 ` Charles Keepax
2018-04-22 23:07 ` [PATCH 04/18 v2] regulator: max8973: Pass descriptor instead of GPIO number Linus Walleij
2018-04-22 23:07 ` [PATCH 05/18 v2] regulator: max77686: " Linus Walleij
2018-04-23 6:46 ` Krzysztof Kozlowski
2018-05-14 6:04 ` Linus Walleij
2018-04-22 23:07 ` Linus Walleij [this message]
2018-04-22 23:07 ` [PATCH 07/18 v2] regulator: lp8788-ldo: " Linus Walleij
2018-04-22 23:07 ` [PATCH 08/18 v2] regulator: max8952: " Linus Walleij
2018-04-22 23:07 ` [PATCH 09/18 v2] regulator: pfuze100: Delete reference to ena_gpio Linus Walleij
2018-04-22 23:07 ` [PATCH 10/18 v2] regulator: s2mps11: Pass descriptor instead of GPIO number Linus Walleij
2018-05-14 7:59 ` Krzysztof Kozlowski
2018-05-14 9:40 ` Krzysztof Kozlowski
2018-04-22 23:07 ` [PATCH 11/18 v2] regulator: s5m8767: " Linus Walleij
2018-04-22 23:07 ` [PATCH 12/18 v2] regulator: tps65090: " Linus Walleij
2018-04-22 23:07 ` [PATCH 13/18 v2] regulator: wm8994: " Linus Walleij
2018-04-23 8:53 ` Charles Keepax
2018-04-23 15:28 ` Mark Brown
2018-05-14 7:55 ` Linus Walleij
2018-05-17 16:41 ` Applied "regulator: wm8994: Pass descriptor instead of GPIO number" to the regulator tree Mark Brown
[not found] ` <CGME20181120134333eucas1p27a19912dddf4b9b34da505e0973c9137@eucas1p2.samsung.com>
2018-11-20 13:43 ` Marek Szyprowski
2018-11-20 14:47 ` Charles Keepax
2018-11-20 14:58 ` Marek Szyprowski
2018-11-20 15:32 ` Charles Keepax
2018-11-20 15:36 ` Charles Keepax
2018-11-20 15:56 ` Marek Szyprowski
2018-11-20 16:16 ` Richard Fitzgerald
2018-11-20 16:34 ` Marek Szyprowski
2018-11-20 16:57 ` Richard Fitzgerald
2018-11-20 17:01 ` Mark Brown
2018-11-20 17:10 ` Richard Fitzgerald
2018-11-20 17:03 ` Charles Keepax
2018-11-20 17:23 ` Marek Szyprowski
2018-11-20 17:12 ` Marek Szyprowski
2018-11-20 15:43 ` Mark Brown
2018-04-22 23:07 ` [PATCH 14/18 v2] regulator: core: Only support passing enable GPIO descriptors Linus Walleij
2018-04-22 23:07 ` [PATCH 15/18 v2] regulator: fixed/gpio: Pull inversion/OD into gpiolib Linus Walleij
2018-04-22 23:07 ` [PATCH 16/18 v2] regulator: fixed/gpio: Update device tree bindings Linus Walleij
2018-04-22 23:07 ` [PATCH 17/18 v2] regulator: gpio: Convert to fully use descriptors Linus Walleij
2018-04-22 23:07 ` [PATCH 18/18 v2] regulator: gpio: Simplify probe path 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=20180422230742.3729-6-linus.walleij@linaro.org \
--to=linus.walleij@linaro.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.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: 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).