From: Krzysztof Kozlowski <krzk@kernel.org>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
linux-kernel@vger.kernel.org, Sangbeom Kim <sbkim73@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>
Subject: Re: [PATCH 10/18 v2] regulator: s2mps11: Pass descriptor instead of GPIO number
Date: Mon, 14 May 2018 11:40:14 +0200 [thread overview]
Message-ID: <CAJKOXPcDwORudUHffzuvMAYo_2gBJDi0k=7B0PZKjT2x4C6yGg@mail.gmail.com> (raw)
In-Reply-To: <CAJKOXPfqxLZQHJn5qXq_J3oNVp1QBXbdzrdrbb2ejToabWtnPw@mail.gmail.com>
On Mon, May 14, 2018 at 9:59 AM, Krzysztof Kozlowski <krzk@kernel.org> wrote:
> On Mon, Apr 23, 2018 at 1:07 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
>> Instead of passing a global GPIO number for the enable GPIO, pass
>> a descriptor looked up with the standard devm_gpiod_get_optional()
>> call.
>>
>> This regulator supports passing platform data, but enable/sleep
>> regulators are looked up from the device tree exclusively, so
>> we can need not touch other files.
>>
>> Cc: Krzysztof Kozlowski <krzk@kernel.org>
>> Cc: Sangbeom Kim <sbkim73@samsung.com>
>> Cc: Chanwoo Choi <cw00.choi@samsung.com>
>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>> ---
>> ChangeLog v1->v2:
>> - Rebase the patch on the other changes.
>> ---
>> drivers/regulator/s2mps11.c | 46 ++++++++++++++++++++++-----------------------
>> 1 file changed, 23 insertions(+), 23 deletions(-)
>>
>> diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
>> index 7726b874e539..9a1dca26362e 100644
>> --- a/drivers/regulator/s2mps11.c
>> +++ b/drivers/regulator/s2mps11.c
>> @@ -18,7 +18,7 @@
>>
>> #include <linux/bug.h>
>> #include <linux/err.h>
>> -#include <linux/gpio.h>
>> +#include <linux/gpio/consumer.h>
>> #include <linux/slab.h>
>> #include <linux/module.h>
>> #include <linux/of.h>
>> @@ -27,7 +27,6 @@
>> #include <linux/regulator/driver.h>
>> #include <linux/regulator/machine.h>
>> #include <linux/regulator/of_regulator.h>
>> -#include <linux/of_gpio.h>
>> #include <linux/mfd/samsung/core.h>
>> #include <linux/mfd/samsung/s2mps11.h>
>> #include <linux/mfd/samsung/s2mps13.h>
>> @@ -57,7 +56,7 @@ struct s2mps11_info {
>> * Array (size: number of regulators) with GPIO-s for external
>> * sleep control.
>> */
>> - int *ext_control_gpio;
>> + struct gpio_desc **ext_control_gpiod;
>> };
>>
>> static int get_ramp_delay(int ramp_delay)
>> @@ -524,7 +523,7 @@ static int s2mps14_regulator_enable(struct regulator_dev *rdev)
>> case S2MPS14X:
>> if (test_bit(rdev_get_id(rdev), s2mps11->suspend_state))
>> val = S2MPS14_ENABLE_SUSPEND;
>> - else if (gpio_is_valid(s2mps11->ext_control_gpio[rdev_get_id(rdev)]))
>> + else if (s2mps11->ext_control_gpiod[rdev_get_id(rdev)])
>> val = S2MPS14_ENABLE_EXT_CONTROL;
>> else
>> val = rdev->desc->enable_mask;
>> @@ -818,7 +817,7 @@ static int s2mps14_pmic_enable_ext_control(struct s2mps11_info *s2mps11,
>> static void s2mps14_pmic_dt_parse_ext_control_gpio(struct platform_device *pdev,
>> struct of_regulator_match *rdata, struct s2mps11_info *s2mps11)
>> {
>> - int *gpio = s2mps11->ext_control_gpio;
>> + struct gpio_desc **gpio = s2mps11->ext_control_gpiod;
>> unsigned int i;
>> unsigned int valid_regulators[3] = { S2MPS14_LDO10, S2MPS14_LDO11,
>> S2MPS14_LDO12 };
>> @@ -829,11 +828,20 @@ static void s2mps14_pmic_dt_parse_ext_control_gpio(struct platform_device *pdev,
>> if (!rdata[reg].init_data || !rdata[reg].of_node)
>> continue;
>>
>> - gpio[reg] = of_get_named_gpio(rdata[reg].of_node,
>> - "samsung,ext-control-gpios", 0);
>> - if (gpio_is_valid(gpio[reg]))
>> - dev_dbg(&pdev->dev, "Using GPIO %d for ext-control over %d/%s\n",
>> - gpio[reg], reg, rdata[reg].name);
>> + gpio[reg] = devm_gpiod_get_from_of_node(&pdev->dev,
>> + rdata[reg].of_node,
>> + "samsung,ext-control-gpios",
>> + 0,
>> + GPIOD_OUT_HIGH,
>> + "s2mps11-LDO");
>
> The same as with max77686 - this can be also for bucks so how about
> the name of "s2mps11-regulator"?
With the name change:
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Tested on Odroid XU3 (with s2mps11 although not using any GPIOs for
regulators, so at least default paths are not broken):
Tested-by: Krzysztof Kozlowski <krzk@kernel.org>
Best regards,
Krzysztof
next prev parent reply other threads:[~2018-05-14 9:40 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 ` [PATCH 06/18 v2] regulator: lm363x: " Linus Walleij
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 [this message]
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='CAJKOXPcDwORudUHffzuvMAYo_2gBJDi0k=7B0PZKjT2x4C6yGg@mail.gmail.com' \
--to=krzk@kernel.org \
--cc=broonie@kernel.org \
--cc=cw00.choi@samsung.com \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sbkim73@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).