Re: [PATCH v3 5/6] regulator: add support for regulator set registration
On 16/06/2014 10:08, Lee Jones wrote:
>> Hello Mark,
>>
>> Did you have time to take a look at this patch ?
>>
>> I'd like to post a new version of this series addressing Lee's comments,
>> but it would be great to have your feedback on this patch before posting
>> a new version.
> I wouldn't do that, as you're likely to upset him.
>
> Just fix what you know and resend.
>
> Mark will subsequently review I'm sure.
Okay, I'll send a new version soon.
>
>> Best Regards,
>>
>> Boris
>>
>> On 27/05/2014 11:38, Boris BREZILLON wrote:
>>> PMIC devices often provide several regulators, and these regulators are
>>> all using the same regmap and are all attached to the same device (the
>>> PMIC device).
>>>
>>> Add helper functions (both simple and resource managed versions) to
>>> register and unregister such kind of regulator set.
>>>
>>> This implementation handles self dependency issues where one regulator
>>> provided the PMIC depends on another one provided by the same PMIC.
>>>
>>> Signed-off-by: Boris BREZILLON
>>> ---
>>> drivers/regulator/core.c | 106
>>> +++
>>> drivers/regulator/devres.c | 68 +
>>> include/linux/regulator/driver.h | 51 +++
>>> 3 files changed, 225 insertions(+)
>>>
>>> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
>>> index 9a09f3c..7703853 100644
>>> --- a/drivers/regulator/core.c
>>> +++ b/drivers/regulator/core.c
>>> @@ -3595,6 +3595,112 @@ void regulator_unregister(struct regulator_dev
>>> *rdev)
>>> EXPORT_SYMBOL_GPL(regulator_unregister);
>>>
>>> /**
>>> + * regulator_set_register - register a set of regulators
>>> + * @config: runtime configuration for regulator set
>>> + *
>>> + * Called by regulator drivers to register a set of regulators.
>>> + * Returns a valid pointer to struct regulator_set on success
>>> + * or an ERR_PTR() on error.
>>> + */
>>> +struct regulator_set *
>>> +regulator_set_register(const struct regulator_set_config *config)
>>> +{
>>> + struct regulator_set *rset;
>>> + int prev_nregistered = -1;
>>> + int nregistered = 0;
>>> + int ret;
>>> + int i;
>>> +
>>> + if (!config->descs || !config->nregulators)
>>> + return ERR_PTR(-EINVAL);
>>> +
>>> + rset = kzalloc(sizeof(*rset) +
>>> + (config->nregulators * sizeof(struct regulator_dev *)),
>>> + GFP_KERNEL);
>>> + if (!rset)
>>> + return ERR_PTR(-ENOMEM);
>>> +
>>> + rset->nregulators = config->nregulators;
>>> +
>>> + while (nregistered < config->nregulators &&
>>> + prev_nregistered < nregistered) {
>>> +
>>> + prev_nregistered = nregistered;
>>> +
>>> + for (i = 0; i < config->nregulators; i++) {
>>> + struct regulator_config conf;
>>> + struct regulator_dev *regulator;
>>> +
>>> + if (rset->regulators[i])
>>> + continue;
>>> +
>>> + memset(, 0, sizeof(conf));
>>> +
>>> + conf.dev = config->dev;
>>> + conf.regmap = config->regmap;
>>> + conf.driver_data = config->driver_data;
>>> + if (config->matches && config->matches[i].init_data)
>>> + conf.init_data = config->matches[i].init_data;
>>> + else if (config->init_data)
>>> + conf.init_data = config->init_data[i];
>>> +
>>> + if (config->matches)
>>> + conf.of_node = config->matches[i].of_node;
>>> +
>>> + regulator = regulator_register(>descs[i],
>>> + );
>>> + if (IS_ERR(regulator)) {
>>> + ret = PTR_ERR(regulator);
>>> + if (ret == -EPROBE_DEFER)
>>> + continue;
>>> +
>>> + goto err;
>>> + }
>>> +
>>> + rset->regulators[i] = regulator;
>>> + nregistered++;
>>> + }
>>> + }
>>> +
>>> + if (nregistered < config->nregulators) {
>>> + ret = -EPROBE_DEFER;
>>> + goto err;
>>> + }
>>> +
>>> + return rset;
>>> +
>>> +err:
>>> + for (i = 0; i < config->nregulators; i++) {
>>> + if (rset->regulators[i])
>>> + regulator_unregister(rset->regulators[i]);
>>> + }
>>> +
>>> + kfree(rset);
>>> +
>>> + return ERR_PTR(ret);
>>> +}
>>> +EXPORT_SYMBOL_GPL(regulator_set_register);
>>> +
>>> +/**
>>> + * regulator_set_unregister - unregister regulator set
>>> + * @rset: regulator set to unregister
>>> + *
>>> + * Called by regulator drivers to unregister a regulator set.
>>> + */
>>> +void regulator_set_unregister(struct regulator_set *rset)
>>> +{
>>> + int i;
>>> +
>>> + for (i = 0; i < rset->nregulators; i++) {
>>> + if
Re: [PATCH v3 5/6] regulator: add support for regulator set registration
> Hello Mark,
>
> Did you have time to take a look at this patch ?
>
> I'd like to post a new version of this series addressing Lee's comments,
> but it would be great to have your feedback on this patch before posting
> a new version.
I wouldn't do that, as you're likely to upset him.
Just fix what you know and resend.
Mark will subsequently review I'm sure.
> Best Regards,
>
> Boris
>
> On 27/05/2014 11:38, Boris BREZILLON wrote:
> > PMIC devices often provide several regulators, and these regulators are
> > all using the same regmap and are all attached to the same device (the
> > PMIC device).
> >
> > Add helper functions (both simple and resource managed versions) to
> > register and unregister such kind of regulator set.
> >
> > This implementation handles self dependency issues where one regulator
> > provided the PMIC depends on another one provided by the same PMIC.
> >
> > Signed-off-by: Boris BREZILLON
> > ---
> > drivers/regulator/core.c | 106
> > +++
> > drivers/regulator/devres.c | 68 +
> > include/linux/regulator/driver.h | 51 +++
> > 3 files changed, 225 insertions(+)
> >
> > diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
> > index 9a09f3c..7703853 100644
> > --- a/drivers/regulator/core.c
> > +++ b/drivers/regulator/core.c
> > @@ -3595,6 +3595,112 @@ void regulator_unregister(struct regulator_dev
> > *rdev)
> > EXPORT_SYMBOL_GPL(regulator_unregister);
> >
> > /**
> > + * regulator_set_register - register a set of regulators
> > + * @config: runtime configuration for regulator set
> > + *
> > + * Called by regulator drivers to register a set of regulators.
> > + * Returns a valid pointer to struct regulator_set on success
> > + * or an ERR_PTR() on error.
> > + */
> > +struct regulator_set *
> > +regulator_set_register(const struct regulator_set_config *config)
> > +{
> > + struct regulator_set *rset;
> > + int prev_nregistered = -1;
> > + int nregistered = 0;
> > + int ret;
> > + int i;
> > +
> > + if (!config->descs || !config->nregulators)
> > + return ERR_PTR(-EINVAL);
> > +
> > + rset = kzalloc(sizeof(*rset) +
> > + (config->nregulators * sizeof(struct regulator_dev *)),
> > + GFP_KERNEL);
> > + if (!rset)
> > + return ERR_PTR(-ENOMEM);
> > +
> > + rset->nregulators = config->nregulators;
> > +
> > + while (nregistered < config->nregulators &&
> > + prev_nregistered < nregistered) {
> > +
> > + prev_nregistered = nregistered;
> > +
> > + for (i = 0; i < config->nregulators; i++) {
> > + struct regulator_config conf;
> > + struct regulator_dev *regulator;
> > +
> > + if (rset->regulators[i])
> > + continue;
> > +
> > + memset(, 0, sizeof(conf));
> > +
> > + conf.dev = config->dev;
> > + conf.regmap = config->regmap;
> > + conf.driver_data = config->driver_data;
> > + if (config->matches && config->matches[i].init_data)
> > + conf.init_data = config->matches[i].init_data;
> > + else if (config->init_data)
> > + conf.init_data = config->init_data[i];
> > +
> > + if (config->matches)
> > + conf.of_node = config->matches[i].of_node;
> > +
> > + regulator = regulator_register(>descs[i],
> > + );
> > + if (IS_ERR(regulator)) {
> > + ret = PTR_ERR(regulator);
> > + if (ret == -EPROBE_DEFER)
> > + continue;
> > +
> > + goto err;
> > + }
> > +
> > + rset->regulators[i] = regulator;
> > + nregistered++;
> > + }
> > + }
> > +
> > + if (nregistered < config->nregulators) {
> > + ret = -EPROBE_DEFER;
> > + goto err;
> > + }
> > +
> > + return rset;
> > +
> > +err:
> > + for (i = 0; i < config->nregulators; i++) {
> > + if (rset->regulators[i])
> > + regulator_unregister(rset->regulators[i]);
> > + }
> > +
> > + kfree(rset);
> > +
> > + return ERR_PTR(ret);
> > +}
> > +EXPORT_SYMBOL_GPL(regulator_set_register);
> > +
> > +/**
> > + * regulator_set_unregister - unregister regulator set
> > + * @rset: regulator set to unregister
> > + *
> > + * Called by regulator drivers to unregister a regulator set.
> > + */
> > +void regulator_set_unregister(struct regulator_set *rset)
> > +{
> > + int i;
> > +
> > + for (i = 0; i < rset->nregulators; i++) {
> > + if (rset->regulators[i])
> > + regulator_unregister(rset->regulators[i]);
> > + }
> > +
> > +
Re: [PATCH v3 5/6] regulator: add support for regulator set registration
Hello Mark,
Did you have time to take a look at this patch ?
I'd like to post a new version of this series addressing Lee's comments,
but it would be great to have your feedback on this patch before posting
a new version.
I wouldn't do that, as you're likely to upset him.
Just fix what you know and resend.
Mark will subsequently review I'm sure.
Best Regards,
Boris
On 27/05/2014 11:38, Boris BREZILLON wrote:
PMIC devices often provide several regulators, and these regulators are
all using the same regmap and are all attached to the same device (the
PMIC device).
Add helper functions (both simple and resource managed versions) to
register and unregister such kind of regulator set.
This implementation handles self dependency issues where one regulator
provided the PMIC depends on another one provided by the same PMIC.
Signed-off-by: Boris BREZILLON boris.brezil...@free-electrons.com
---
drivers/regulator/core.c | 106
+++
drivers/regulator/devres.c | 68 +
include/linux/regulator/driver.h | 51 +++
3 files changed, 225 insertions(+)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9a09f3c..7703853 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3595,6 +3595,112 @@ void regulator_unregister(struct regulator_dev
*rdev)
EXPORT_SYMBOL_GPL(regulator_unregister);
/**
+ * regulator_set_register - register a set of regulators
+ * @config: runtime configuration for regulator set
+ *
+ * Called by regulator drivers to register a set of regulators.
+ * Returns a valid pointer to struct regulator_set on success
+ * or an ERR_PTR() on error.
+ */
+struct regulator_set *
+regulator_set_register(const struct regulator_set_config *config)
+{
+ struct regulator_set *rset;
+ int prev_nregistered = -1;
+ int nregistered = 0;
+ int ret;
+ int i;
+
+ if (!config-descs || !config-nregulators)
+ return ERR_PTR(-EINVAL);
+
+ rset = kzalloc(sizeof(*rset) +
+ (config-nregulators * sizeof(struct regulator_dev *)),
+ GFP_KERNEL);
+ if (!rset)
+ return ERR_PTR(-ENOMEM);
+
+ rset-nregulators = config-nregulators;
+
+ while (nregistered config-nregulators
+ prev_nregistered nregistered) {
+
+ prev_nregistered = nregistered;
+
+ for (i = 0; i config-nregulators; i++) {
+ struct regulator_config conf;
+ struct regulator_dev *regulator;
+
+ if (rset-regulators[i])
+ continue;
+
+ memset(conf, 0, sizeof(conf));
+
+ conf.dev = config-dev;
+ conf.regmap = config-regmap;
+ conf.driver_data = config-driver_data;
+ if (config-matches config-matches[i].init_data)
+ conf.init_data = config-matches[i].init_data;
+ else if (config-init_data)
+ conf.init_data = config-init_data[i];
+
+ if (config-matches)
+ conf.of_node = config-matches[i].of_node;
+
+ regulator = regulator_register(config-descs[i],
+ conf);
+ if (IS_ERR(regulator)) {
+ ret = PTR_ERR(regulator);
+ if (ret == -EPROBE_DEFER)
+ continue;
+
+ goto err;
+ }
+
+ rset-regulators[i] = regulator;
+ nregistered++;
+ }
+ }
+
+ if (nregistered config-nregulators) {
+ ret = -EPROBE_DEFER;
+ goto err;
+ }
+
+ return rset;
+
+err:
+ for (i = 0; i config-nregulators; i++) {
+ if (rset-regulators[i])
+ regulator_unregister(rset-regulators[i]);
+ }
+
+ kfree(rset);
+
+ return ERR_PTR(ret);
+}
+EXPORT_SYMBOL_GPL(regulator_set_register);
+
+/**
+ * regulator_set_unregister - unregister regulator set
+ * @rset: regulator set to unregister
+ *
+ * Called by regulator drivers to unregister a regulator set.
+ */
+void regulator_set_unregister(struct regulator_set *rset)
+{
+ int i;
+
+ for (i = 0; i rset-nregulators; i++) {
+ if (rset-regulators[i])
+ regulator_unregister(rset-regulators[i]);
+ }
+
+ kfree(rset);
+}
+EXPORT_SYMBOL_GPL(regulator_set_unregister);
+
+/**
* regulator_suspend_prepare - prepare regulators for system wide suspend
* @state: system suspend state
*
diff --git a/drivers/regulator/devres.c
Re: [PATCH v3 5/6] regulator: add support for regulator set registration
On 16/06/2014 10:08, Lee Jones wrote:
Hello Mark,
Did you have time to take a look at this patch ?
I'd like to post a new version of this series addressing Lee's comments,
but it would be great to have your feedback on this patch before posting
a new version.
I wouldn't do that, as you're likely to upset him.
Just fix what you know and resend.
Mark will subsequently review I'm sure.
Okay, I'll send a new version soon.
Best Regards,
Boris
On 27/05/2014 11:38, Boris BREZILLON wrote:
PMIC devices often provide several regulators, and these regulators are
all using the same regmap and are all attached to the same device (the
PMIC device).
Add helper functions (both simple and resource managed versions) to
register and unregister such kind of regulator set.
This implementation handles self dependency issues where one regulator
provided the PMIC depends on another one provided by the same PMIC.
Signed-off-by: Boris BREZILLON boris.brezil...@free-electrons.com
---
drivers/regulator/core.c | 106
+++
drivers/regulator/devres.c | 68 +
include/linux/regulator/driver.h | 51 +++
3 files changed, 225 insertions(+)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9a09f3c..7703853 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3595,6 +3595,112 @@ void regulator_unregister(struct regulator_dev
*rdev)
EXPORT_SYMBOL_GPL(regulator_unregister);
/**
+ * regulator_set_register - register a set of regulators
+ * @config: runtime configuration for regulator set
+ *
+ * Called by regulator drivers to register a set of regulators.
+ * Returns a valid pointer to struct regulator_set on success
+ * or an ERR_PTR() on error.
+ */
+struct regulator_set *
+regulator_set_register(const struct regulator_set_config *config)
+{
+ struct regulator_set *rset;
+ int prev_nregistered = -1;
+ int nregistered = 0;
+ int ret;
+ int i;
+
+ if (!config-descs || !config-nregulators)
+ return ERR_PTR(-EINVAL);
+
+ rset = kzalloc(sizeof(*rset) +
+ (config-nregulators * sizeof(struct regulator_dev *)),
+ GFP_KERNEL);
+ if (!rset)
+ return ERR_PTR(-ENOMEM);
+
+ rset-nregulators = config-nregulators;
+
+ while (nregistered config-nregulators
+ prev_nregistered nregistered) {
+
+ prev_nregistered = nregistered;
+
+ for (i = 0; i config-nregulators; i++) {
+ struct regulator_config conf;
+ struct regulator_dev *regulator;
+
+ if (rset-regulators[i])
+ continue;
+
+ memset(conf, 0, sizeof(conf));
+
+ conf.dev = config-dev;
+ conf.regmap = config-regmap;
+ conf.driver_data = config-driver_data;
+ if (config-matches config-matches[i].init_data)
+ conf.init_data = config-matches[i].init_data;
+ else if (config-init_data)
+ conf.init_data = config-init_data[i];
+
+ if (config-matches)
+ conf.of_node = config-matches[i].of_node;
+
+ regulator = regulator_register(config-descs[i],
+ conf);
+ if (IS_ERR(regulator)) {
+ ret = PTR_ERR(regulator);
+ if (ret == -EPROBE_DEFER)
+ continue;
+
+ goto err;
+ }
+
+ rset-regulators[i] = regulator;
+ nregistered++;
+ }
+ }
+
+ if (nregistered config-nregulators) {
+ ret = -EPROBE_DEFER;
+ goto err;
+ }
+
+ return rset;
+
+err:
+ for (i = 0; i config-nregulators; i++) {
+ if (rset-regulators[i])
+ regulator_unregister(rset-regulators[i]);
+ }
+
+ kfree(rset);
+
+ return ERR_PTR(ret);
+}
+EXPORT_SYMBOL_GPL(regulator_set_register);
+
+/**
+ * regulator_set_unregister - unregister regulator set
+ * @rset: regulator set to unregister
+ *
+ * Called by regulator drivers to unregister a regulator set.
+ */
+void regulator_set_unregister(struct regulator_set *rset)
+{
+ int i;
+
+ for (i = 0; i rset-nregulators; i++) {
+ if (rset-regulators[i])
+ regulator_unregister(rset-regulators[i]);
+ }
+
+ kfree(rset);
+}
+EXPORT_SYMBOL_GPL(regulator_set_unregister);
+
+/**
* regulator_suspend_prepare - prepare regulators for system wide suspend
* @state: system suspend state
*
diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c
index f44818b..a34f34c 100644
---
Re: [PATCH v3 5/6] regulator: add support for regulator set registration
Hello Mark,
Did you have time to take a look at this patch ?
I'd like to post a new version of this series addressing Lee's comments,
but it would be great to have your feedback on this patch before posting
a new version.
Best Regards,
Boris
On 27/05/2014 11:38, Boris BREZILLON wrote:
> PMIC devices often provide several regulators, and these regulators are
> all using the same regmap and are all attached to the same device (the
> PMIC device).
>
> Add helper functions (both simple and resource managed versions) to
> register and unregister such kind of regulator set.
>
> This implementation handles self dependency issues where one regulator
> provided the PMIC depends on another one provided by the same PMIC.
>
> Signed-off-by: Boris BREZILLON
> ---
> drivers/regulator/core.c | 106
> +++
> drivers/regulator/devres.c | 68 +
> include/linux/regulator/driver.h | 51 +++
> 3 files changed, 225 insertions(+)
>
> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
> index 9a09f3c..7703853 100644
> --- a/drivers/regulator/core.c
> +++ b/drivers/regulator/core.c
> @@ -3595,6 +3595,112 @@ void regulator_unregister(struct regulator_dev *rdev)
> EXPORT_SYMBOL_GPL(regulator_unregister);
>
> /**
> + * regulator_set_register - register a set of regulators
> + * @config: runtime configuration for regulator set
> + *
> + * Called by regulator drivers to register a set of regulators.
> + * Returns a valid pointer to struct regulator_set on success
> + * or an ERR_PTR() on error.
> + */
> +struct regulator_set *
> +regulator_set_register(const struct regulator_set_config *config)
> +{
> + struct regulator_set *rset;
> + int prev_nregistered = -1;
> + int nregistered = 0;
> + int ret;
> + int i;
> +
> + if (!config->descs || !config->nregulators)
> + return ERR_PTR(-EINVAL);
> +
> + rset = kzalloc(sizeof(*rset) +
> +(config->nregulators * sizeof(struct regulator_dev *)),
> +GFP_KERNEL);
> + if (!rset)
> + return ERR_PTR(-ENOMEM);
> +
> + rset->nregulators = config->nregulators;
> +
> + while (nregistered < config->nregulators &&
> +prev_nregistered < nregistered) {
> +
> + prev_nregistered = nregistered;
> +
> + for (i = 0; i < config->nregulators; i++) {
> + struct regulator_config conf;
> + struct regulator_dev *regulator;
> +
> + if (rset->regulators[i])
> + continue;
> +
> + memset(, 0, sizeof(conf));
> +
> + conf.dev = config->dev;
> + conf.regmap = config->regmap;
> + conf.driver_data = config->driver_data;
> + if (config->matches && config->matches[i].init_data)
> + conf.init_data = config->matches[i].init_data;
> + else if (config->init_data)
> + conf.init_data = config->init_data[i];
> +
> + if (config->matches)
> + conf.of_node = config->matches[i].of_node;
> +
> + regulator = regulator_register(>descs[i],
> +);
> + if (IS_ERR(regulator)) {
> + ret = PTR_ERR(regulator);
> + if (ret == -EPROBE_DEFER)
> + continue;
> +
> + goto err;
> + }
> +
> + rset->regulators[i] = regulator;
> + nregistered++;
> + }
> + }
> +
> + if (nregistered < config->nregulators) {
> + ret = -EPROBE_DEFER;
> + goto err;
> + }
> +
> + return rset;
> +
> +err:
> + for (i = 0; i < config->nregulators; i++) {
> + if (rset->regulators[i])
> + regulator_unregister(rset->regulators[i]);
> + }
> +
> + kfree(rset);
> +
> + return ERR_PTR(ret);
> +}
> +EXPORT_SYMBOL_GPL(regulator_set_register);
> +
> +/**
> + * regulator_set_unregister - unregister regulator set
> + * @rset: regulator set to unregister
> + *
> + * Called by regulator drivers to unregister a regulator set.
> + */
> +void regulator_set_unregister(struct regulator_set *rset)
> +{
> + int i;
> +
> + for (i = 0; i < rset->nregulators; i++) {
> + if (rset->regulators[i])
> + regulator_unregister(rset->regulators[i]);
> + }
> +
> + kfree(rset);
> +}
> +EXPORT_SYMBOL_GPL(regulator_set_unregister);
> +
> +/**
> * regulator_suspend_prepare - prepare regulators for system wide suspend
> * @state: system suspend state
> *
> diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c
> index f44818b..a34f34c
Re: [PATCH v3 5/6] regulator: add support for regulator set registration
Hello Mark,
Did you have time to take a look at this patch ?
I'd like to post a new version of this series addressing Lee's comments,
but it would be great to have your feedback on this patch before posting
a new version.
Best Regards,
Boris
On 27/05/2014 11:38, Boris BREZILLON wrote:
PMIC devices often provide several regulators, and these regulators are
all using the same regmap and are all attached to the same device (the
PMIC device).
Add helper functions (both simple and resource managed versions) to
register and unregister such kind of regulator set.
This implementation handles self dependency issues where one regulator
provided the PMIC depends on another one provided by the same PMIC.
Signed-off-by: Boris BREZILLON boris.brezil...@free-electrons.com
---
drivers/regulator/core.c | 106
+++
drivers/regulator/devres.c | 68 +
include/linux/regulator/driver.h | 51 +++
3 files changed, 225 insertions(+)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9a09f3c..7703853 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3595,6 +3595,112 @@ void regulator_unregister(struct regulator_dev *rdev)
EXPORT_SYMBOL_GPL(regulator_unregister);
/**
+ * regulator_set_register - register a set of regulators
+ * @config: runtime configuration for regulator set
+ *
+ * Called by regulator drivers to register a set of regulators.
+ * Returns a valid pointer to struct regulator_set on success
+ * or an ERR_PTR() on error.
+ */
+struct regulator_set *
+regulator_set_register(const struct regulator_set_config *config)
+{
+ struct regulator_set *rset;
+ int prev_nregistered = -1;
+ int nregistered = 0;
+ int ret;
+ int i;
+
+ if (!config-descs || !config-nregulators)
+ return ERR_PTR(-EINVAL);
+
+ rset = kzalloc(sizeof(*rset) +
+(config-nregulators * sizeof(struct regulator_dev *)),
+GFP_KERNEL);
+ if (!rset)
+ return ERR_PTR(-ENOMEM);
+
+ rset-nregulators = config-nregulators;
+
+ while (nregistered config-nregulators
+prev_nregistered nregistered) {
+
+ prev_nregistered = nregistered;
+
+ for (i = 0; i config-nregulators; i++) {
+ struct regulator_config conf;
+ struct regulator_dev *regulator;
+
+ if (rset-regulators[i])
+ continue;
+
+ memset(conf, 0, sizeof(conf));
+
+ conf.dev = config-dev;
+ conf.regmap = config-regmap;
+ conf.driver_data = config-driver_data;
+ if (config-matches config-matches[i].init_data)
+ conf.init_data = config-matches[i].init_data;
+ else if (config-init_data)
+ conf.init_data = config-init_data[i];
+
+ if (config-matches)
+ conf.of_node = config-matches[i].of_node;
+
+ regulator = regulator_register(config-descs[i],
+conf);
+ if (IS_ERR(regulator)) {
+ ret = PTR_ERR(regulator);
+ if (ret == -EPROBE_DEFER)
+ continue;
+
+ goto err;
+ }
+
+ rset-regulators[i] = regulator;
+ nregistered++;
+ }
+ }
+
+ if (nregistered config-nregulators) {
+ ret = -EPROBE_DEFER;
+ goto err;
+ }
+
+ return rset;
+
+err:
+ for (i = 0; i config-nregulators; i++) {
+ if (rset-regulators[i])
+ regulator_unregister(rset-regulators[i]);
+ }
+
+ kfree(rset);
+
+ return ERR_PTR(ret);
+}
+EXPORT_SYMBOL_GPL(regulator_set_register);
+
+/**
+ * regulator_set_unregister - unregister regulator set
+ * @rset: regulator set to unregister
+ *
+ * Called by regulator drivers to unregister a regulator set.
+ */
+void regulator_set_unregister(struct regulator_set *rset)
+{
+ int i;
+
+ for (i = 0; i rset-nregulators; i++) {
+ if (rset-regulators[i])
+ regulator_unregister(rset-regulators[i]);
+ }
+
+ kfree(rset);
+}
+EXPORT_SYMBOL_GPL(regulator_set_unregister);
+
+/**
* regulator_suspend_prepare - prepare regulators for system wide suspend
* @state: system suspend state
*
diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c
index f44818b..a34f34c 100644
--- a/drivers/regulator/devres.c
+++ b/drivers/regulator/devres.c
@@ -251,6 +251,74 @@ void
[PATCH v3 5/6] regulator: add support for regulator set registration
PMIC devices often provide several regulators, and these regulators are
all using the same regmap and are all attached to the same device (the
PMIC device).
Add helper functions (both simple and resource managed versions) to
register and unregister such kind of regulator set.
This implementation handles self dependency issues where one regulator
provided the PMIC depends on another one provided by the same PMIC.
Signed-off-by: Boris BREZILLON
---
drivers/regulator/core.c | 106 +++
drivers/regulator/devres.c | 68 +
include/linux/regulator/driver.h | 51 +++
3 files changed, 225 insertions(+)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9a09f3c..7703853 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3595,6 +3595,112 @@ void regulator_unregister(struct regulator_dev *rdev)
EXPORT_SYMBOL_GPL(regulator_unregister);
/**
+ * regulator_set_register - register a set of regulators
+ * @config: runtime configuration for regulator set
+ *
+ * Called by regulator drivers to register a set of regulators.
+ * Returns a valid pointer to struct regulator_set on success
+ * or an ERR_PTR() on error.
+ */
+struct regulator_set *
+regulator_set_register(const struct regulator_set_config *config)
+{
+ struct regulator_set *rset;
+ int prev_nregistered = -1;
+ int nregistered = 0;
+ int ret;
+ int i;
+
+ if (!config->descs || !config->nregulators)
+ return ERR_PTR(-EINVAL);
+
+ rset = kzalloc(sizeof(*rset) +
+ (config->nregulators * sizeof(struct regulator_dev *)),
+ GFP_KERNEL);
+ if (!rset)
+ return ERR_PTR(-ENOMEM);
+
+ rset->nregulators = config->nregulators;
+
+ while (nregistered < config->nregulators &&
+ prev_nregistered < nregistered) {
+
+ prev_nregistered = nregistered;
+
+ for (i = 0; i < config->nregulators; i++) {
+ struct regulator_config conf;
+ struct regulator_dev *regulator;
+
+ if (rset->regulators[i])
+ continue;
+
+ memset(, 0, sizeof(conf));
+
+ conf.dev = config->dev;
+ conf.regmap = config->regmap;
+ conf.driver_data = config->driver_data;
+ if (config->matches && config->matches[i].init_data)
+ conf.init_data = config->matches[i].init_data;
+ else if (config->init_data)
+ conf.init_data = config->init_data[i];
+
+ if (config->matches)
+ conf.of_node = config->matches[i].of_node;
+
+ regulator = regulator_register(>descs[i],
+ );
+ if (IS_ERR(regulator)) {
+ ret = PTR_ERR(regulator);
+ if (ret == -EPROBE_DEFER)
+ continue;
+
+ goto err;
+ }
+
+ rset->regulators[i] = regulator;
+ nregistered++;
+ }
+ }
+
+ if (nregistered < config->nregulators) {
+ ret = -EPROBE_DEFER;
+ goto err;
+ }
+
+ return rset;
+
+err:
+ for (i = 0; i < config->nregulators; i++) {
+ if (rset->regulators[i])
+ regulator_unregister(rset->regulators[i]);
+ }
+
+ kfree(rset);
+
+ return ERR_PTR(ret);
+}
+EXPORT_SYMBOL_GPL(regulator_set_register);
+
+/**
+ * regulator_set_unregister - unregister regulator set
+ * @rset: regulator set to unregister
+ *
+ * Called by regulator drivers to unregister a regulator set.
+ */
+void regulator_set_unregister(struct regulator_set *rset)
+{
+ int i;
+
+ for (i = 0; i < rset->nregulators; i++) {
+ if (rset->regulators[i])
+ regulator_unregister(rset->regulators[i]);
+ }
+
+ kfree(rset);
+}
+EXPORT_SYMBOL_GPL(regulator_set_unregister);
+
+/**
* regulator_suspend_prepare - prepare regulators for system wide suspend
* @state: system suspend state
*
diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c
index f44818b..a34f34c 100644
--- a/drivers/regulator/devres.c
+++ b/drivers/regulator/devres.c
@@ -251,6 +251,74 @@ void devm_regulator_unregister(struct device *dev, struct
regulator_dev *rdev)
}
EXPORT_SYMBOL_GPL(devm_regulator_unregister);
+static void devm_rset_release(struct device *dev, void *res)
+{
+ regulator_set_unregister(*(struct regulator_set **)res);
+}
+
+/**
+ * devm_regulator_set_register - Resource managed regulator_set_register()
[PATCH v3 5/6] regulator: add support for regulator set registration
PMIC devices often provide several regulators, and these regulators are
all using the same regmap and are all attached to the same device (the
PMIC device).
Add helper functions (both simple and resource managed versions) to
register and unregister such kind of regulator set.
This implementation handles self dependency issues where one regulator
provided the PMIC depends on another one provided by the same PMIC.
Signed-off-by: Boris BREZILLON boris.brezil...@free-electrons.com
---
drivers/regulator/core.c | 106 +++
drivers/regulator/devres.c | 68 +
include/linux/regulator/driver.h | 51 +++
3 files changed, 225 insertions(+)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9a09f3c..7703853 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3595,6 +3595,112 @@ void regulator_unregister(struct regulator_dev *rdev)
EXPORT_SYMBOL_GPL(regulator_unregister);
/**
+ * regulator_set_register - register a set of regulators
+ * @config: runtime configuration for regulator set
+ *
+ * Called by regulator drivers to register a set of regulators.
+ * Returns a valid pointer to struct regulator_set on success
+ * or an ERR_PTR() on error.
+ */
+struct regulator_set *
+regulator_set_register(const struct regulator_set_config *config)
+{
+ struct regulator_set *rset;
+ int prev_nregistered = -1;
+ int nregistered = 0;
+ int ret;
+ int i;
+
+ if (!config-descs || !config-nregulators)
+ return ERR_PTR(-EINVAL);
+
+ rset = kzalloc(sizeof(*rset) +
+ (config-nregulators * sizeof(struct regulator_dev *)),
+ GFP_KERNEL);
+ if (!rset)
+ return ERR_PTR(-ENOMEM);
+
+ rset-nregulators = config-nregulators;
+
+ while (nregistered config-nregulators
+ prev_nregistered nregistered) {
+
+ prev_nregistered = nregistered;
+
+ for (i = 0; i config-nregulators; i++) {
+ struct regulator_config conf;
+ struct regulator_dev *regulator;
+
+ if (rset-regulators[i])
+ continue;
+
+ memset(conf, 0, sizeof(conf));
+
+ conf.dev = config-dev;
+ conf.regmap = config-regmap;
+ conf.driver_data = config-driver_data;
+ if (config-matches config-matches[i].init_data)
+ conf.init_data = config-matches[i].init_data;
+ else if (config-init_data)
+ conf.init_data = config-init_data[i];
+
+ if (config-matches)
+ conf.of_node = config-matches[i].of_node;
+
+ regulator = regulator_register(config-descs[i],
+ conf);
+ if (IS_ERR(regulator)) {
+ ret = PTR_ERR(regulator);
+ if (ret == -EPROBE_DEFER)
+ continue;
+
+ goto err;
+ }
+
+ rset-regulators[i] = regulator;
+ nregistered++;
+ }
+ }
+
+ if (nregistered config-nregulators) {
+ ret = -EPROBE_DEFER;
+ goto err;
+ }
+
+ return rset;
+
+err:
+ for (i = 0; i config-nregulators; i++) {
+ if (rset-regulators[i])
+ regulator_unregister(rset-regulators[i]);
+ }
+
+ kfree(rset);
+
+ return ERR_PTR(ret);
+}
+EXPORT_SYMBOL_GPL(regulator_set_register);
+
+/**
+ * regulator_set_unregister - unregister regulator set
+ * @rset: regulator set to unregister
+ *
+ * Called by regulator drivers to unregister a regulator set.
+ */
+void regulator_set_unregister(struct regulator_set *rset)
+{
+ int i;
+
+ for (i = 0; i rset-nregulators; i++) {
+ if (rset-regulators[i])
+ regulator_unregister(rset-regulators[i]);
+ }
+
+ kfree(rset);
+}
+EXPORT_SYMBOL_GPL(regulator_set_unregister);
+
+/**
* regulator_suspend_prepare - prepare regulators for system wide suspend
* @state: system suspend state
*
diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c
index f44818b..a34f34c 100644
--- a/drivers/regulator/devres.c
+++ b/drivers/regulator/devres.c
@@ -251,6 +251,74 @@ void devm_regulator_unregister(struct device *dev, struct
regulator_dev *rdev)
}
EXPORT_SYMBOL_GPL(devm_regulator_unregister);
+static void devm_rset_release(struct device *dev, void *res)
+{
+ regulator_set_unregister(*(struct regulator_set **)res);
+}
+
+/**
+ * devm_regulator_set_register - Resource managed
