Skip to content

L
linux
Commit d22b85a1 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Mark Brown
Browse files
Options

regulator: core: Expose some of core functions needed by couplers 

Expose some of internal functions that are required for implementation of
customized regulator couplers.
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d8ca7d18
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 31 deletions
drivers/regulator/core.c
View file @ d22b85a1
...@@ -100,7 +100,6 @@ struct regulator_supply_alias { ...@@ -100,7 +100,6 @@ struct regulator_supply_alias {
static int _regulator_is_enabled(struct regulator_dev *rdev); static int _regulator_is_enabled(struct regulator_dev *rdev);
static int _regulator_disable(struct regulator *regulator); static int _regulator_disable(struct regulator *regulator);
static int _regulator_get_voltage(struct regulator_dev *rdev);
static int _regulator_get_current_limit(struct regulator_dev *rdev); static int _regulator_get_current_limit(struct regulator_dev *rdev);
static unsigned int _regulator_get_mode(struct regulator_dev *rdev); static unsigned int _regulator_get_mode(struct regulator_dev *rdev);
static int _notifier_call_chain(struct regulator_dev *rdev, static int _notifier_call_chain(struct regulator_dev *rdev,
...@@ -109,15 +108,12 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, ...@@ -109,15 +108,12 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
int min_uV, int max_uV); int min_uV, int max_uV);
static int regulator_balance_voltage(struct regulator_dev *rdev, static int regulator_balance_voltage(struct regulator_dev *rdev,
suspend_state_t state); suspend_state_t state);
static int regulator_set_voltage_rdev(struct regulator_dev *rdev,
int min_uV, int max_uV,
suspend_state_t state);
static struct regulator *create_regulator(struct regulator_dev *rdev, static struct regulator *create_regulator(struct regulator_dev *rdev,
struct device *dev, struct device *dev,
const char *supply_name); const char *supply_name);
static void _regulator_put(struct regulator *regulator); static void _regulator_put(struct regulator *regulator);
static const char *rdev_get_name(struct regulator_dev *rdev) const char *rdev_get_name(struct regulator_dev *rdev)
{ {
if (rdev->constraints && rdev->constraints->name) if (rdev->constraints && rdev->constraints->name)
return rdev->constraints->name; return rdev->constraints->name;
...@@ -431,8 +427,8 @@ static struct device_node *of_get_regulator(struct device *dev, const char *supp ...@@ -431,8 +427,8 @@ static struct device_node *of_get_regulator(struct device *dev, const char *supp
} }
/* Platform voltage constraint check */ /* Platform voltage constraint check */
static int regulator_check_voltage(struct regulator_dev *rdev, int regulator_check_voltage(struct regulator_dev *rdev,
int *min_uV, int *max_uV) int *min_uV, int *max_uV)
{ {
BUG_ON(*min_uV > *max_uV); BUG_ON(*min_uV > *max_uV);
...@@ -464,9 +460,9 @@ static int regulator_check_states(suspend_state_t state) ...@@ -464,9 +460,9 @@ static int regulator_check_states(suspend_state_t state)
/* Make sure we select a voltage that suits the needs of all /* Make sure we select a voltage that suits the needs of all
* regulator consumers * regulator consumers
*/ */
static int regulator_check_consumers(struct regulator_dev *rdev, int regulator_check_consumers(struct regulator_dev *rdev,
int *min_uV, int *max_uV, int *min_uV, int *max_uV,
suspend_state_t state) suspend_state_t state)
{ {
struct regulator *regulator; struct regulator *regulator;
struct regulator_voltage *voltage; struct regulator_voltage *voltage;
...@@ -577,7 +573,7 @@ static ssize_t regulator_uV_show(struct device *dev, ...@@ -577,7 +573,7 @@ static ssize_t regulator_uV_show(struct device *dev,
ssize_t ret; ssize_t ret;
regulator_lock(rdev); regulator_lock(rdev);
ret = sprintf(buf, "%d\n", _regulator_get_voltage(rdev)); ret = sprintf(buf, "%d\n", regulator_get_voltage_rdev(rdev));
regulator_unlock(rdev); regulator_unlock(rdev);
return ret; return ret;
...@@ -948,7 +944,7 @@ static int drms_uA_update(struct regulator_dev *rdev) ...@@ -948,7 +944,7 @@ static int drms_uA_update(struct regulator_dev *rdev)
rdev_err(rdev, "failed to set load %d\n", current_uA); rdev_err(rdev, "failed to set load %d\n", current_uA);
} else { } else {
/* get output voltage */ /* get output voltage */
output_uV = _regulator_get_voltage(rdev); output_uV = regulator_get_voltage_rdev(rdev);
if (output_uV <= 0) { if (output_uV <= 0) {
rdev_err(rdev, "invalid output voltage found\n"); rdev_err(rdev, "invalid output voltage found\n");
return -EINVAL; return -EINVAL;
...@@ -1061,7 +1057,7 @@ static void print_constraints(struct regulator_dev *rdev) ...@@ -1061,7 +1057,7 @@ static void print_constraints(struct regulator_dev *rdev)
if (!constraints->min_uV || if (!constraints->min_uV ||
constraints->min_uV != constraints->max_uV) { constraints->min_uV != constraints->max_uV) {
ret = _regulator_get_voltage(rdev); ret = regulator_get_voltage_rdev(rdev);
if (ret > 0) if (ret > 0)
count += scnprintf(buf + count, len - count, count += scnprintf(buf + count, len - count,
"at %d mV ", ret / 1000); "at %d mV ", ret / 1000);
...@@ -1120,7 +1116,7 @@ static int machine_constraints_voltage(struct regulator_dev *rdev, ...@@ -1120,7 +1116,7 @@ static int machine_constraints_voltage(struct regulator_dev *rdev,
if (rdev->constraints->apply_uV && if (rdev->constraints->apply_uV &&
rdev->constraints->min_uV && rdev->constraints->max_uV) { rdev->constraints->min_uV && rdev->constraints->max_uV) {
int target_min, target_max; int target_min, target_max;
int current_uV = _regulator_get_voltage(rdev); int current_uV = regulator_get_voltage_rdev(rdev);
if (current_uV == -ENOTRECOVERABLE) { if (current_uV == -ENOTRECOVERABLE) {
/* This regulator can't be read and must be initialized */ /* This regulator can't be read and must be initialized */
...@@ -1130,7 +1126,7 @@ static int machine_constraints_voltage(struct regulator_dev *rdev, ...@@ -1130,7 +1126,7 @@ static int machine_constraints_voltage(struct regulator_dev *rdev,
_regulator_do_set_voltage(rdev, _regulator_do_set_voltage(rdev,
rdev->constraints->min_uV, rdev->constraints->min_uV,
rdev->constraints->max_uV); rdev->constraints->max_uV);
current_uV = _regulator_get_voltage(rdev); current_uV = regulator_get_voltage_rdev(rdev);
} }
if (current_uV < 0) { if (current_uV < 0) {
...@@ -3072,7 +3068,7 @@ static int _regulator_call_set_voltage(struct regulator_dev *rdev, ...@@ -3072,7 +3068,7 @@ static int _regulator_call_set_voltage(struct regulator_dev *rdev,
struct pre_voltage_change_data data; struct pre_voltage_change_data data;
int ret; int ret;
data.old_uV = _regulator_get_voltage(rdev); data.old_uV = regulator_get_voltage_rdev(rdev);
data.min_uV = min_uV; data.min_uV = min_uV;
data.max_uV = max_uV; data.max_uV = max_uV;
ret = _notifier_call_chain(rdev, REGULATOR_EVENT_PRE_VOLTAGE_CHANGE, ret = _notifier_call_chain(rdev, REGULATOR_EVENT_PRE_VOLTAGE_CHANGE,
...@@ -3096,7 +3092,7 @@ static int _regulator_call_set_voltage_sel(struct regulator_dev *rdev, ...@@ -3096,7 +3092,7 @@ static int _regulator_call_set_voltage_sel(struct regulator_dev *rdev,
struct pre_voltage_change_data data; struct pre_voltage_change_data data;
int ret; int ret;
data.old_uV = _regulator_get_voltage(rdev); data.old_uV = regulator_get_voltage_rdev(rdev);
data.min_uV = uV; data.min_uV = uV;
data.max_uV = uV; data.max_uV = uV;
ret = _notifier_call_chain(rdev, REGULATOR_EVENT_PRE_VOLTAGE_CHANGE, ret = _notifier_call_chain(rdev, REGULATOR_EVENT_PRE_VOLTAGE_CHANGE,
...@@ -3149,7 +3145,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, ...@@ -3149,7 +3145,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
unsigned int selector; unsigned int selector;
int old_selector = -1; int old_selector = -1;
const struct regulator_ops *ops = rdev->desc->ops; const struct regulator_ops *ops = rdev->desc->ops;
int old_uV = _regulator_get_voltage(rdev); int old_uV = regulator_get_voltage_rdev(rdev);
trace_regulator_set_voltage(rdev_get_name(rdev), min_uV, max_uV); trace_regulator_set_voltage(rdev_get_name(rdev), min_uV, max_uV);
...@@ -3176,7 +3172,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, ...@@ -3176,7 +3172,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
best_val = ops->list_voltage(rdev, best_val = ops->list_voltage(rdev,
selector); selector);
else else
best_val = _regulator_get_voltage(rdev); best_val = regulator_get_voltage_rdev(rdev);
} }
} else if (ops->set_voltage_sel) { } else if (ops->set_voltage_sel) {
...@@ -3295,7 +3291,7 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, ...@@ -3295,7 +3291,7 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
* changing the voltage. * changing the voltage.
*/ */
if (!regulator_ops_is_valid(rdev, REGULATOR_CHANGE_VOLTAGE)) { if (!regulator_ops_is_valid(rdev, REGULATOR_CHANGE_VOLTAGE)) {
current_uV = _regulator_get_voltage(rdev); current_uV = regulator_get_voltage_rdev(rdev);
if (min_uV <= current_uV && current_uV <= max_uV) { if (min_uV <= current_uV && current_uV <= max_uV) {
voltage->min_uV = min_uV; voltage->min_uV = min_uV;
voltage->max_uV = max_uV; voltage->max_uV = max_uV;
...@@ -3332,8 +3328,8 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, ...@@ -3332,8 +3328,8 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
return ret; return ret;
} }
static int regulator_set_voltage_rdev(struct regulator_dev *rdev, int min_uV, int regulator_set_voltage_rdev(struct regulator_dev *rdev, int min_uV,
int max_uV, suspend_state_t state) int max_uV, suspend_state_t state)
{ {
int best_supply_uV = 0; int best_supply_uV = 0;
int supply_change_uV = 0; int supply_change_uV = 0;
...@@ -3361,7 +3357,7 @@ static int regulator_set_voltage_rdev(struct regulator_dev *rdev, int min_uV, ...@@ -3361,7 +3357,7 @@ static int regulator_set_voltage_rdev(struct regulator_dev *rdev, int min_uV,
best_supply_uV += rdev->desc->min_dropout_uV; best_supply_uV += rdev->desc->min_dropout_uV;
current_supply_uV = _regulator_get_voltage(rdev->supply->rdev); current_supply_uV = regulator_get_voltage_rdev(rdev->supply->rdev);
if (current_supply_uV < 0) { if (current_supply_uV < 0) {
ret = current_supply_uV; ret = current_supply_uV;
goto out; goto out;
...@@ -3412,7 +3408,7 @@ static int regulator_limit_voltage_step(struct regulator_dev *rdev, ...@@ -3412,7 +3408,7 @@ static int regulator_limit_voltage_step(struct regulator_dev *rdev,
return 1; return 1;
if (*current_uV < 0) { if (*current_uV < 0) {
*current_uV = _regulator_get_voltage(rdev); *current_uV = regulator_get_voltage_rdev(rdev);
if (*current_uV < 0) if (*current_uV < 0)
return *current_uV; return *current_uV;
...@@ -3517,7 +3513,7 @@ static int regulator_get_optimal_voltage(struct regulator_dev *rdev, ...@@ -3517,7 +3513,7 @@ static int regulator_get_optimal_voltage(struct regulator_dev *rdev,
if (!_regulator_is_enabled(c_rdevs[i])) if (!_regulator_is_enabled(c_rdevs[i]))
continue; continue;
tmp_act = _regulator_get_voltage(c_rdevs[i]); tmp_act = regulator_get_voltage_rdev(c_rdevs[i]);
if (tmp_act < 0) if (tmp_act < 0)
return tmp_act; return tmp_act;
...@@ -3559,7 +3555,7 @@ static int regulator_get_optimal_voltage(struct regulator_dev *rdev, ...@@ -3559,7 +3555,7 @@ static int regulator_get_optimal_voltage(struct regulator_dev *rdev,
if (n_coupled > 1 && *current_uV == -1) { if (n_coupled > 1 && *current_uV == -1) {
if (_regulator_is_enabled(rdev)) { if (_regulator_is_enabled(rdev)) {
ret = _regulator_get_voltage(rdev); ret = regulator_get_voltage_rdev(rdev);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -3923,7 +3919,7 @@ int regulator_sync_voltage(struct regulator *regulator) ...@@ -3923,7 +3919,7 @@ int regulator_sync_voltage(struct regulator *regulator)
} }
EXPORT_SYMBOL_GPL(regulator_sync_voltage); EXPORT_SYMBOL_GPL(regulator_sync_voltage);
static int _regulator_get_voltage(struct regulator_dev *rdev) int regulator_get_voltage_rdev(struct regulator_dev *rdev)
{ {
int sel, ret; int sel, ret;
bool bypassed; bool bypassed;
...@@ -3940,7 +3936,7 @@ static int _regulator_get_voltage(struct regulator_dev *rdev) ...@@ -3940,7 +3936,7 @@ static int _regulator_get_voltage(struct regulator_dev *rdev)
return -EPROBE_DEFER; return -EPROBE_DEFER;
} }
return _regulator_get_voltage(rdev->supply->rdev); return regulator_get_voltage_rdev(rdev->supply->rdev);
} }
} }
...@@ -3956,7 +3952,7 @@ static int _regulator_get_voltage(struct regulator_dev *rdev) ...@@ -3956,7 +3952,7 @@ static int _regulator_get_voltage(struct regulator_dev *rdev)
} else if (rdev->desc->fixed_uV && (rdev->desc->n_voltages == 1)) { } else if (rdev->desc->fixed_uV && (rdev->desc->n_voltages == 1)) {
ret = rdev->desc->fixed_uV; ret = rdev->desc->fixed_uV;
} else if (rdev->supply) { } else if (rdev->supply) {
ret = _regulator_get_voltage(rdev->supply->rdev); ret = regulator_get_voltage_rdev(rdev->supply->rdev);
} else { } else {
return -EINVAL; return -EINVAL;
} }
...@@ -3981,7 +3977,7 @@ int regulator_get_voltage(struct regulator *regulator) ...@@ -3981,7 +3977,7 @@ int regulator_get_voltage(struct regulator *regulator)
int ret; int ret;
regulator_lock_dependent(regulator->rdev, &ww_ctx); regulator_lock_dependent(regulator->rdev, &ww_ctx);
ret = _regulator_get_voltage(regulator->rdev); ret = regulator_get_voltage_rdev(regulator->rdev);
regulator_unlock_dependent(regulator->rdev, &ww_ctx); regulator_unlock_dependent(regulator->rdev, &ww_ctx);
return ret; return ret;
...@@ -5377,7 +5373,7 @@ static void regulator_summary_show_subtree(struct seq_file *s, ...@@ -5377,7 +5373,7 @@ static void regulator_summary_show_subtree(struct seq_file *s,
rdev->use_count, rdev->open_count, rdev->bypass_count, rdev->use_count, rdev->open_count, rdev->bypass_count,
regulator_opmode_to_str(opmode)); regulator_opmode_to_str(opmode));
seq_printf(s, "%5dmV ", _regulator_get_voltage(rdev) / 1000); seq_printf(s, "%5dmV ", regulator_get_voltage_rdev(rdev) / 1000);
seq_printf(s, "%5dmA ", seq_printf(s, "%5dmA ",
_regulator_get_current_limit_unlocked(rdev) / 1000); _regulator_get_current_limit_unlocked(rdev) / 1000);
......
include/linux/regulator/coupler.h
View file @ d22b85a1
...@@ -52,11 +52,46 @@ struct regulator_coupler { ...@@ -52,11 +52,46 @@ struct regulator_coupler {
#ifdef CONFIG_REGULATOR #ifdef CONFIG_REGULATOR
int regulator_coupler_register(struct regulator_coupler *coupler); int regulator_coupler_register(struct regulator_coupler *coupler);
const char *rdev_get_name(struct regulator_dev *rdev);
int regulator_check_consumers(struct regulator_dev *rdev,
int *min_uV, int *max_uV,
suspend_state_t state);
int regulator_check_voltage(struct regulator_dev *rdev,
int *min_uV, int *max_uV);
int regulator_get_voltage_rdev(struct regulator_dev *rdev);
int regulator_set_voltage_rdev(struct regulator_dev *rdev,
int min_uV, int max_uV,
suspend_state_t state);
#else #else
static inline int regulator_coupler_register(struct regulator_coupler *coupler) static inline int regulator_coupler_register(struct regulator_coupler *coupler)
{ {
return 0; return 0;
} }
static inline const char *rdev_get_name(struct regulator_dev *rdev)
{
return NULL;
}
static inline int regulator_check_consumers(struct regulator_dev *rdev,
int *min_uV, int *max_uV,
suspend_state_t state)
{
return -EINVAL;
}
static inline int regulator_check_voltage(struct regulator_dev *rdev,
int *min_uV, int *max_uV)
{
return -EINVAL;
}
static inline int regulator_get_voltage_rdev(struct regulator_dev *rdev)
{
return -EINVAL;
}
static inline int regulator_set_voltage_rdev(struct regulator_dev *rdev,
int min_uV, int max_uV,
suspend_state_t state)
{
return -EINVAL;
}
#endif #endif
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7