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>,
Chanwoo Choi <cw00.choi@samsung.com>,
Krzysztof Kozlowski <krzk@kernel.org>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: [PATCH 05/19 v3] regulator: max77686: Pass descriptor instead of GPIO number
Date: Mon, 14 May 2018 10:06:26 +0200 [thread overview]
Message-ID: <20180514080640.12515-6-linus.walleij@linaro.org> (raw)
In-Reply-To: <20180514080640.12515-1-linus.walleij@linaro.org>
Instead of passing a global GPIO number, pass a descriptor looked
up from the device tree configuration node.
Cc: Chanwoo Choi <cw00.choi@samsung.com>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v2->v3:
- Name the regulator "max77686-regulator"
- Set the regulator to NULL on erroneous lookup, restoring the
old init data lookup behaviour.
ChangeLog v1->v2:
- Rebase the patch on the other changes.
---
drivers/regulator/max77686-regulator.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/regulator/max77686-regulator.c b/drivers/regulator/max77686-regulator.c
index c301f3733475..37f98a8350f0 100644
--- a/drivers/regulator/max77686-regulator.c
+++ b/drivers/regulator/max77686-regulator.c
@@ -25,8 +25,7 @@
#include <linux/kernel.h>
#include <linux/bug.h>
#include <linux/err.h>
-#include <linux/gpio.h>
-#include <linux/of_gpio.h>
+#include <linux/gpio/consumer.h>
#include <linux/slab.h>
#include <linux/platform_device.h>
#include <linux/regulator/driver.h>
@@ -90,6 +89,7 @@ enum max77686_ramp_rate {
};
struct max77686_data {
+ struct device *dev;
DECLARE_BITMAP(gpio_enabled, MAX77686_REGULATORS);
/* Array indexed by regulator id */
@@ -269,16 +269,20 @@ static int max77686_of_parse_cb(struct device_node *np,
case MAX77686_BUCK8:
case MAX77686_BUCK9:
case MAX77686_LDO20 ... MAX77686_LDO22:
- config->ena_gpio = of_get_named_gpio(np,
- "maxim,ena-gpios", 0);
- config->ena_gpio_flags = GPIOF_OUT_INIT_HIGH;
- config->ena_gpio_initialized = true;
+ config->ena_gpiod = devm_gpiod_get_from_of_node(max77686->dev,
+ np,
+ "maxim,ena",
+ 0,
+ GPIOD_OUT_HIGH,
+ "max77686-regulator");
+ if (IS_ERR(config->ena_gpiod))
+ config->ena_gpiod = NULL;
break;
default:
return 0;
}
- if (gpio_is_valid(config->ena_gpio)) {
+ if (config->ena_gpiod) {
set_bit(desc->id, max77686->gpio_enabled);
return regmap_update_bits(config->regmap, desc->enable_reg,
@@ -521,6 +525,7 @@ static int max77686_pmic_probe(struct platform_device *pdev)
if (!max77686)
return -ENOMEM;
+ max77686->dev = &pdev->dev;
config.dev = iodev->dev;
config.regmap = iodev->regmap;
config.driver_data = max77686;
--
2.17.0
next prev parent reply other threads:[~2018-05-14 8:18 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 ` Linus Walleij [this message]
2018-05-14 9:28 ` [PATCH 05/19 v3] regulator: max77686: " 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 ` [PATCH 08/19 v3] regulator: max8952: " Linus Walleij
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-6-linus.walleij@linaro.org \
--to=linus.walleij@linaro.org \
--cc=b.zolnierkie@samsung.com \
--cc=broonie@kernel.org \
--cc=cw00.choi@samsung.com \
--cc=krzk@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).