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>,
MyungJoo Ham <myungjoo.ham@samsung.com>
Subject: [PATCH 08/19 v3] regulator: max8952: Pass descriptor instead of GPIO number
Date: Mon, 14 May 2018 10:06:29 +0200 [thread overview]
Message-ID: <20180514080640.12515-9-linus.walleij@linaro.org> (raw)
In-Reply-To: <20180514080640.12515-1-linus.walleij@linaro.org>
Instead of passing a global GPIO number for the enable GPIO, pass
a descriptor looked up with the standard devm_gpiod_get_optional()
call.
All users of this regulator use device tree so the transition is
pretty smooth.
Cc: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v2->v3:
- Resending.
ChangeLog v1->v2:
- Rebase the patch on the other changes.
---
drivers/regulator/max8952.c | 18 +++++++++++++-----
include/linux/regulator/max8952.h | 1 -
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c
index 1096546c05e9..f1e77ed5dfec 100644
--- a/drivers/regulator/max8952.c
+++ b/drivers/regulator/max8952.c
@@ -27,6 +27,7 @@
#include <linux/regulator/driver.h>
#include <linux/regulator/max8952.h>
#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
#include <linux/io.h>
#include <linux/of.h>
#include <linux/of_gpio.h>
@@ -148,7 +149,6 @@ static struct max8952_platform_data *max8952_parse_dt(struct device *dev)
pd->gpio_vid0 = of_get_named_gpio(np, "max8952,vid-gpios", 0);
pd->gpio_vid1 = of_get_named_gpio(np, "max8952,vid-gpios", 1);
- pd->gpio_en = of_get_named_gpio(np, "max8952,en-gpio", 0);
if (of_property_read_u32(np, "max8952,default-mode", &pd->default_mode))
dev_warn(dev, "Default mode not specified, assuming 0\n");
@@ -197,6 +197,8 @@ static int max8952_pmic_probe(struct i2c_client *client,
struct regulator_config config = { };
struct max8952_data *max8952;
struct regulator_dev *rdev;
+ struct gpio_desc *gpiod;
+ enum gpiod_flags gflags;
int ret = 0, err = 0;
@@ -224,11 +226,17 @@ static int max8952_pmic_probe(struct i2c_client *client,
config.driver_data = max8952;
config.of_node = client->dev.of_node;
- config.ena_gpio = pdata->gpio_en;
- if (client->dev.of_node)
- config.ena_gpio_initialized = true;
if (pdata->reg_data->constraints.boot_on)
- config.ena_gpio_flags |= GPIOF_OUT_INIT_HIGH;
+ gflags = GPIOD_OUT_HIGH;
+ else
+ gflags = GPIOD_OUT_LOW;
+ gpiod = devm_gpiod_get_optional(&client->dev,
+ "max8952,en",
+ gflags);
+ if (IS_ERR(gpiod))
+ return PTR_ERR(gpiod);
+ if (gpiod)
+ config.ena_gpiod = gpiod;
rdev = devm_regulator_register(&client->dev, ®ulator, &config);
if (IS_ERR(rdev)) {
diff --git a/include/linux/regulator/max8952.h b/include/linux/regulator/max8952.h
index 4dbb63a1d4ab..686c42c041b5 100644
--- a/include/linux/regulator/max8952.h
+++ b/include/linux/regulator/max8952.h
@@ -120,7 +120,6 @@ enum {
struct max8952_platform_data {
int gpio_vid0;
int gpio_vid1;
- int gpio_en;
u32 default_mode;
u32 dvs_mode[MAX8952_NUM_DVS_MODE]; /* MAX8952_DVS_MODEx_XXXXmV */
--
2.17.0
next prev parent reply other threads:[~2018-05-14 8:07 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 8:06 [PATCH 00/19 v3] Refactor fixed and GPIO regulators Linus Walleij
2018-05-14 8:06 ` [PATCH 01/19 v3] regulator: fixed: Convert to use GPIO descriptor only Linus Walleij
2018-05-14 11:03 ` Andy Shevchenko
2018-05-21 11:27 ` Linus Walleij
2018-07-06 15:21 ` Andy Shevchenko
2018-05-14 11:49 ` Geert Uytterhoeven
2018-05-17 19:50 ` Tony Lindgren
2018-05-30 21:27 ` Arnd Bergmann
2018-06-01 9:35 ` Thierry Reding
2018-06-01 9:36 ` Thierry Reding
2018-06-01 10:21 ` Mark Brown
2018-06-11 13:11 ` Linus Walleij
2018-06-11 15:00 ` Mark Brown
2018-06-12 8:15 ` Linus Walleij
2018-06-12 11:00 ` Mark Brown
2018-05-14 8:06 ` [PATCH 02/19 v3] regulator: gpio: Get enable GPIO using GPIO descriptor Linus Walleij
2018-05-14 8:06 ` [PATCH 03/19 v3] regulator: arizona-ldo1: Look up a descriptor and pass to the core Linus Walleij
2018-05-15 11:53 ` Charles Keepax
2018-05-17 16:41 ` Applied "regulator: arizona-ldo1: Look up a descriptor and pass to the core" to the regulator tree Mark Brown
2018-05-14 8:06 ` [PATCH 04/19 v3] regulator: max8973: Pass descriptor instead of GPIO number Linus Walleij
2018-05-14 8:06 ` [PATCH 05/19 v3] regulator: max77686: " Linus Walleij
2018-05-14 9:28 ` Krzysztof Kozlowski
2018-05-17 16:41 ` Applied "regulator: max77686: Pass descriptor instead of GPIO number" to the regulator tree Mark Brown
2018-05-14 8:06 ` [PATCH 06/19 v3] regulator: lm363x: Pass descriptor instead of GPIO number Linus Walleij
2018-05-14 8:06 ` [PATCH 07/19 v3] regulator: lp8788-ldo: " Linus Walleij
2018-05-14 8:06 ` Linus Walleij [this message]
2018-05-14 8:06 ` [PATCH 09/19 v3] regulator: pfuze100: Delete reference to ena_gpio Linus Walleij
2018-05-14 8:06 ` [PATCH 10/19 v3] regulator: s2mps11: Pass descriptor instead of GPIO number Linus Walleij
2018-05-14 9:42 ` Krzysztof Kozlowski
2018-05-26 10:02 ` Mark Brown
2018-05-28 8:41 ` Linus Walleij
[not found] ` <CGME20180528112908eucas1p2946a9b6385fcaf6c19921c9767420405@eucas1p2.samsung.com>
2018-05-28 11:29 ` Bartlomiej Zolnierkiewicz
2018-05-28 12:26 ` Andy Shevchenko
2018-05-30 7:10 ` Linus Walleij
2018-05-29 14:47 ` Mark Brown
[not found] ` <CGME20180530134408eucas1p14c6d7fe692e2ed91ef833c8a1ead8ce7@eucas1p1.samsung.com>
2018-05-30 13:44 ` Bartlomiej Zolnierkiewicz
2018-05-30 14:16 ` Mark Brown
2018-05-14 8:06 ` [PATCH 11/19 v3] regulator: s5m8767: " Linus Walleij
2018-05-14 8:06 ` [PATCH 12/19 v3] regulator: tps65090: " Linus Walleij
2018-05-14 8:06 ` [PATCH 13/19 v3] regulator: wm8994: " Linus Walleij
2018-05-14 8:06 ` [PATCH 14/19 v3] regulator: core: Only support passing enable GPIO descriptors Linus Walleij
2018-05-14 8:06 ` [PATCH 15/19 v3] regulator: fixed/gpio: Pull inversion/OD into gpiolib Linus Walleij
2018-05-29 14:54 ` Mark Brown
2018-05-30 7:15 ` Linus Walleij
2018-05-14 8:06 ` [PATCH 16/19 v3] regulator: fixed/gpio: Update device tree bindings Linus Walleij
2018-05-14 8:06 ` [PATCH 17/19 v3] regulator: gpio: Convert to fully use descriptors Linus Walleij
2018-05-14 8:06 ` [PATCH 18/19 v3] regulator: gpio: Simplify probe path Linus Walleij
2018-05-14 8:06 ` [PATCH 19/19 v3] ARM: s3c64xx: Tidy up handling of regulator GPIO lookups Linus Walleij
2018-05-17 5:06 ` Mark Brown
2018-05-21 11:24 ` 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=20180514080640.12515-9-linus.walleij@linaro.org \
--to=linus.walleij@linaro.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=myungjoo.ham@samsung.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).