sugar/linux
1
0
Fork 0
Code Activity

pmdomain: Merge tag regulator-devm-of-get into next

Browse Source 
Merge the tag regulator-devm-of-get from
git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next.

This introduces devm_of_regulator_get without the _optional suffix, since
that is more sensible for the Rockchip usecase.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Ulf Hansson
2025-02-28 12:39:40 +01:00
parent c432bdcf39 0dffacbbf8
commit a8e9ef4c8f
3 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/regulator/devres.c
View File

@@ -771,6 +771,23 @@ static struct regulator *_devm_of_regulator_get(struct device *dev, struct devic
return regulator;
}
/**
* devm_of_regulator_get - Resource managed of_regulator_get()
* @dev: device used for dev_printk() messages and resource lifetime management
* @node: device node for regulator "consumer"
* @id: supply name or regulator ID.
*
* Managed of_regulator_get(). Regulators returned from this
* function are automatically regulator_put() on driver detach. See
* of_regulator_get() for more information.
*/
struct regulator *devm_of_regulator_get(struct device *dev, struct device_node *node,
const char *id)
{
return _devm_of_regulator_get(dev, node, id, NORMAL_GET);
}
EXPORT_SYMBOL_GPL(devm_of_regulator_get);
/**
* devm_of_regulator_get_optional - Resource managed of_regulator_get_optional()
* @dev: device used for dev_printk() messages and resource lifetime management

21
drivers/regulator/of_regulator.c
View File

@@ -697,6 +697,27 @@ struct regulator *_of_regulator_get(struct device *dev, struct device_node *node
return _regulator_get_common(r, dev, id, get_type);
}
/**
* of_regulator_get - get regulator via device tree lookup
* @dev: device used for dev_printk() messages
* @node: device node for regulator "consumer"
* @id: Supply name
*
* Return: pointer to struct regulator corresponding to the regulator producer,
* or PTR_ERR() encoded error number.
*
* This is intended for use by consumers that want to get a regulator
* supply directly from a device node. This will _not_ consider supply
* aliases. See regulator_dev_lookup().
*/
struct regulator *of_regulator_get(struct device *dev,
struct device_node *node,
const char *id)
{
return _of_regulator_get(dev, node, id, NORMAL_GET);
}
EXPORT_SYMBOL_GPL(of_regulator_get);
/**
* of_regulator_get_optional - get optional regulator via device tree lookup
* @dev: device used for dev_printk() messages

6
include/linux/regulator/consumer.h
View File

@@ -677,6 +677,12 @@ regulator_is_equal(struct regulator *reg1, struct regulator *reg2)
#endif
#if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_REGULATOR)
struct regulator *__must_check of_regulator_get(struct device *dev,
struct device_node *node,
const char *id);
struct regulator *__must_check devm_of_regulator_get(struct device *dev,
struct device_node *node,
const char *id);
struct regulator *__must_check of_regulator_get_optional(struct device *dev,
struct device_node *node,
const char *id);