[PATCH 1/3] dt-bindings: regulator: regulator-output: Multiple supplies

[PATCH 1/3] dt-bindings: regulator: regulator-output: Multiple supplies

[Naresh Solanki]

Add support for multiple supplies.

Signed-off-by: Naresh Solanki <naresh.solanki@9elements.com>
---
 .../devicetree/bindings/regulator/regulator-output.yaml  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/regulator/regulator-output.yaml b/Documentation/devicetree/bindings/regulator/regulator-output.yaml
index 078b37a1a71a..6d077f123729 100644
--- a/Documentation/devicetree/bindings/regulator/regulator-output.yaml
+++ b/Documentation/devicetree/bindings/regulator/regulator-output.yaml
@@ -21,13 +21,13 @@ properties:
   compatible:
     const: regulator-output
 
-  vout-supply:
+patternProperties:
+  ".*-supply":
     description:
       Phandle of the regulator supplying the output.
 
 required:
   - compatible
-  - vout-supply
 
 additionalProperties: false
 
@@ -37,3 +37,8 @@ examples:
           compatible = "regulator-output";
           vout-supply = <&output_reg>;
       };
+      output1 {
+          compatible = "regulator-output";
+          sw0-supply = <&output_reg0>;
+          sw1-supply = <&output_reg2>;
+      };

base-commit: f9a1d31874c383f58bb4f89bfe79b764682cd026
-- 
2.41.0

[PATCH 2/3] regulator: userspace-consumer: Retrieve supplies from DT

[Naresh Solanki]

From: Naresh Solanki <Naresh.Solanki@9elements.com>

Instead of hardcoding a single supply, retrieve supplies from DT.

Signed-off-by: Naresh Solanki <Naresh.Solanki@9elements.com>
---
Changes in V2:
- Use strlen for SUPPLY_SUFFIX_LEN,
- Remove bracket for single line statements in if statement.
- Remove extra space in variable declaration.
- Simplify multi line statement by calculating size in seperate
  variable.
- Add function prop_supply_name & simplify code.
- Use devm_kstrdup instead to simplify code further.
- Update DT binding to align with changes.
---
 drivers/regulator/userspace-consumer.c | 51 ++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/drivers/regulator/userspace-consumer.c b/drivers/regulator/userspace-consumer.c
index 97f075ed68c9..13c0a86ab32c 100644
--- a/drivers/regulator/userspace-consumer.c
+++ b/drivers/regulator/userspace-consumer.c
@@ -115,12 +115,41 @@ static const struct attribute_group attr_group = {
 	.is_visible =  attr_visible,
 };
 
+#define SUPPLY_SUFFIX "-supply"
+#define SUPPLY_SUFFIX_LEN strlen(SUPPLY_SUFFIX)
+
+static size_t prop_supply_name(char *prop_name)
+{
+	int len = strlen(prop_name);
+
+	if (len <= SUPPLY_SUFFIX_LEN)
+		return 0;
+
+	if (strcmp(prop_name + len - SUPPLY_SUFFIX_LEN, SUPPLY_SUFFIX) == 0)
+		return len - SUPPLY_SUFFIX_LEN;
+
+	return 0;
+}
+
+static int get_num_supplies(struct platform_device *pdev)
+{
+	struct  property *prop;
+	int num_supplies = 0;
+
+	for_each_property_of_node(pdev->dev.of_node, prop) {
+		if (prop_supply_name(prop->name))
+			num_supplies++;
+	}
+	return num_supplies;
+}
+
 static int regulator_userspace_consumer_probe(struct platform_device *pdev)
 {
 	struct regulator_userspace_consumer_data tmpdata;
 	struct regulator_userspace_consumer_data *pdata;
 	struct userspace_consumer_data *drvdata;
-	int ret;
+	struct property *prop;
+	int ret, supplies_size;
 
 	pdata = dev_get_platdata(&pdev->dev);
 	if (!pdata) {
@@ -131,11 +160,25 @@ static int regulator_userspace_consumer_probe(struct platform_device *pdev)
 		memset(pdata, 0, sizeof(*pdata));
 
 		pdata->no_autoswitch = true;
-		pdata->num_supplies = 1;
-		pdata->supplies = devm_kzalloc(&pdev->dev, sizeof(*pdata->supplies), GFP_KERNEL);
+		pdata->num_supplies = get_num_supplies(pdev);
+
+		supplies_size = pdata->num_supplies * sizeof(*pdata->supplies);
+		pdata->supplies = devm_kzalloc(&pdev->dev, supplies_size, GFP_KERNEL);
 		if (!pdata->supplies)
 			return -ENOMEM;
-		pdata->supplies[0].supply = "vout";
+
+		for_each_property_of_node(pdev->dev.of_node, prop) {
+			const char *prop_name = prop->name;
+			size_t supply_len = prop_supply_name(prop->name);
+
+			if (!supply_len)
+				continue;
+
+			char *supply_name = devm_kstrdup(&pdev->dev, prop_name, GFP_KERNEL);
+
+			supply_name[supply_len] = '\0';
+			pdata->supplies[0].supply = supply_name;
+		}
 	}
 
 	if (pdata->num_supplies < 1) {
-- 
2.41.0

[PATCH 3/3] regulator: userspace-consumer: Update name

[Naresh Solanki]

Set name to dt node name.

Signed-off-by: Naresh Solanki <naresh.solanki@9elements.com>
---
 drivers/regulator/userspace-consumer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/regulator/userspace-consumer.c b/drivers/regulator/userspace-consumer.c
index 13c0a86ab32c..9030e1d9ce3c 100644
--- a/drivers/regulator/userspace-consumer.c
+++ b/drivers/regulator/userspace-consumer.c
@@ -159,6 +159,7 @@ static int regulator_userspace_consumer_probe(struct platform_device *pdev)
 		pdata = &tmpdata;
 		memset(pdata, 0, sizeof(*pdata));
 
+		pdata->name = devm_kstrdup(&pdev->dev, pdev->dev.of_node->name, GFP_KERNEL);
 		pdata->no_autoswitch = true;
 		pdata->num_supplies = get_num_supplies(pdev);
 
-- 
2.41.0

Re: [PATCH 1/3] dt-bindings: regulator: regulator-output: Multiple supplies

[Rob Herring]

On Wed, Oct 04, 2023 at 02:05:26PM +0200, Naresh Solanki wrote:
> Add support for multiple supplies.

Why?

> 
> Signed-off-by: Naresh Solanki <naresh.solanki@9elements.com>
> ---
>  .../devicetree/bindings/regulator/regulator-output.yaml  | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/regulator/regulator-output.yaml b/Documentation/devicetree/bindings/regulator/regulator-output.yaml
> index 078b37a1a71a..6d077f123729 100644
> --- a/Documentation/devicetree/bindings/regulator/regulator-output.yaml
> +++ b/Documentation/devicetree/bindings/regulator/regulator-output.yaml
> @@ -21,13 +21,13 @@ properties:
>    compatible:
>      const: regulator-output
>  
> -  vout-supply:
> +patternProperties:
> +  ".*-supply":
>      description:
>        Phandle of the regulator supplying the output.
>  
>  required:
>    - compatible
> -  - vout-supply
>  
>  additionalProperties: false
>  
> @@ -37,3 +37,8 @@ examples:
>            compatible = "regulator-output";
>            vout-supply = <&output_reg>;
>        };
> +      output1 {
> +          compatible = "regulator-output";
> +          sw0-supply = <&output_reg0>;
> +          sw1-supply = <&output_reg2>;
> +      };
> 
> base-commit: f9a1d31874c383f58bb4f89bfe79b764682cd026
> -- 
> 2.41.0
> 

Re: [PATCH 1/3] dt-bindings: regulator: regulator-output: Multiple supplies

[Naresh Solanki]

Hi Rob,


On Wed, 4 Oct 2023 at 20:44, Rob Herring <robh@kernel.org> wrote:
>
> On Wed, Oct 04, 2023 at 02:05:26PM +0200, Naresh Solanki wrote:
> > Add support for multiple supplies.
>
> Why?
1. Driver is already capable of that using platform data. Hence added
support to read DT property & initialize the same for multiple
supplies instead of being limited to one.
2. This is particularly useful in cases wherein 2 or more regulators
are coupled together, for example in a PCIe connector having 3.3V &
12V.

Regards,
Naresh
>
> >
> > Signed-off-by: Naresh Solanki <naresh.solanki@9elements.com>
> > ---
> >  .../devicetree/bindings/regulator/regulator-output.yaml  | 9 +++++++--
> >  1 file changed, 7 insertions(+), 2 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/regulator/regulator-output.yaml b/Documentation/devicetree/bindings/regulator/regulator-output.yaml
> > index 078b37a1a71a..6d077f123729 100644
> > --- a/Documentation/devicetree/bindings/regulator/regulator-output.yaml
> > +++ b/Documentation/devicetree/bindings/regulator/regulator-output.yaml
> > @@ -21,13 +21,13 @@ properties:
> >    compatible:
> >      const: regulator-output
> >
> > -  vout-supply:
> > +patternProperties:
> > +  ".*-supply":
> >      description:
> >        Phandle of the regulator supplying the output.
> >
> >  required:
> >    - compatible
> > -  - vout-supply
> >
> >  additionalProperties: false
> >
> > @@ -37,3 +37,8 @@ examples:
> >            compatible = "regulator-output";
> >            vout-supply = <&output_reg>;
> >        };
> > +      output1 {
> > +          compatible = "regulator-output";
> > +          sw0-supply = <&output_reg0>;
> > +          sw1-supply = <&output_reg2>;
> > +      };
> >
> > base-commit: f9a1d31874c383f58bb4f89bfe79b764682cd026
> > --
> > 2.41.0
> >

Re: [PATCH 1/3] dt-bindings: regulator: regulator-output: Multiple supplies

[Krzysztof Kozlowski]

On 05/10/2023 09:46, Naresh Solanki wrote:
> Hi Rob,
> 
> 
> On Wed, 4 Oct 2023 at 20:44, Rob Herring <robh@kernel.org> wrote:
>>
>> On Wed, Oct 04, 2023 at 02:05:26PM +0200, Naresh Solanki wrote:
>>> Add support for multiple supplies.
>>
>> Why?
> 1. Driver is already capable of that using platform data. Hence added
> support to read DT property & initialize the same for multiple
> supplies instead of being limited to one.

I am not sure that's a valid reason. Bindings focus on the hardware. We
do not describe here driver capabilities.

> 2. This is particularly useful in cases wherein 2 or more regulators
> are coupled together, for example in a PCIe connector having 3.3V &
> 12V.

Commit message should explain this. Each commit, when not obvious,
should say why you are doing things.

Best regards,
Krzysztof

Re: [PATCH 1/3] dt-bindings: regulator: regulator-output: Multiple supplies

[Zev Weiss]

On Thu, Oct 05, 2023 at 12:46:31AM PDT, Naresh Solanki wrote:
>Hi Rob,
>
>
>On Wed, 4 Oct 2023 at 20:44, Rob Herring <robh@kernel.org> wrote:
>>
>> On Wed, Oct 04, 2023 at 02:05:26PM +0200, Naresh Solanki wrote:
>> > Add support for multiple supplies.
>>
>> Why?
>1. Driver is already capable of that using platform data. Hence added
>support to read DT property & initialize the same for multiple
>supplies instead of being limited to one.
>2. This is particularly useful in cases wherein 2 or more regulators
>are coupled together, for example in a PCIe connector having 3.3V &
>12V.
>

Hmm -- apologies if I pointed you in the wrong direction here on the 
last revision (or should have considered this earlier), but is there a 
particular need for this arrangement to be described by a single 
regulator-output DT node instead of just having one node per supply?  If 
they're independently-controlled voltage outputs, treating them as two 
separate things instead of a single ganged one seems like it might be 
more appropriate anyway...


Zev