mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-16 17:23:55 +08:00
regulator: da903x: Convert to set_voltage_sel and map_voltage
Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin
Mark Brown
parent
70b4e7862d
commit
c972a02948
@ -101,21 +101,14 @@ static inline int check_range(struct da903x_regulator_info *info,
|
||||
}
|
||||
|
||||
/* DA9030/DA9034 common operations */
|
||||
static int da903x_set_ldo_voltage(struct regulator_dev *rdev,
|
||||
int min_uV, int max_uV, unsigned *selector)
|
||||
static int da903x_set_ldo_voltage_sel(struct regulator_dev *rdev,
|
||||
unsigned selector)
|
||||
{
|
||||
struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
|
||||
struct device *da9034_dev = to_da903x_dev(rdev);
|
||||
uint8_t val, mask;
|
||||
|
||||
if (check_range(info, min_uV, max_uV)) {
|
||||
pr_err("invalid voltage range (%d, %d) uV\n", min_uV, max_uV);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
val = DIV_ROUND_UP(min_uV - info->desc.min_uV, info->desc.uV_step);
|
||||
*selector = val;
|
||||
val <<= info->vol_shift;
|
||||
val = selector << info->vol_shift;
|
||||
mask = ((1 << info->vol_nbits) - 1) << info->vol_shift;
|
||||
|
||||
return da903x_update(da9034_dev, info->vol_reg, val, mask);
|
||||
@ -171,23 +164,15 @@ static int da903x_is_enabled(struct regulator_dev *rdev)
|
||||
}
|
||||
|
||||
/* DA9030 specific operations */
|
||||
static int da9030_set_ldo1_15_voltage(struct regulator_dev *rdev,
|
||||
int min_uV, int max_uV,
|
||||
unsigned *selector)
|
||||
static int da9030_set_ldo1_15_voltage_sel(struct regulator_dev *rdev,
|
||||
unsigned selector)
|
||||
{
|
||||
struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
|
||||
struct device *da903x_dev = to_da903x_dev(rdev);
|
||||
uint8_t val, mask;
|
||||
int ret;
|
||||
|
||||
if (check_range(info, min_uV, max_uV)) {
|
||||
pr_err("invalid voltage range (%d, %d) uV\n", min_uV, max_uV);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
val = DIV_ROUND_UP(min_uV - info->desc.min_uV, info->desc.uV_step);
|
||||
*selector = val;
|
||||
val <<= info->vol_shift;
|
||||
val = selector << info->vol_shift;
|
||||
mask = ((1 << info->vol_nbits) - 1) << info->vol_shift;
|
||||
val |= DA9030_LDO_UNLOCK; /* have to set UNLOCK bits */
|
||||
mask |= DA9030_LDO_UNLOCK_MASK;
|
||||
@ -200,14 +185,24 @@ static int da9030_set_ldo1_15_voltage(struct regulator_dev *rdev,
|
||||
return da903x_update(da903x_dev, info->vol_reg, val, mask);
|
||||
}
|
||||
|
||||
static int da9030_set_ldo14_voltage(struct regulator_dev *rdev,
|
||||
int min_uV, int max_uV,
|
||||
unsigned *selector)
|
||||
static int da9030_set_ldo14_voltage_sel(struct regulator_dev *rdev,
|
||||
unsigned selector)
|
||||
{
|
||||
struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
|
||||
struct device *da903x_dev = to_da903x_dev(rdev);
|
||||
uint8_t val, mask;
|
||||
int thresh;
|
||||
|
||||
val = selector << info->vol_shift;
|
||||
mask = ((1 << info->vol_nbits) - 1) << info->vol_shift;
|
||||
|
||||
return da903x_update(da903x_dev, info->vol_reg, val, mask);
|
||||
}
|
||||
|
||||
static int da9030_map_ldo14_voltage(struct regulator_dev *rdev,
|
||||
int min_uV, int max_uV)
|
||||
{
|
||||
struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
|
||||
int thresh, sel;
|
||||
|
||||
if (check_range(info, min_uV, max_uV)) {
|
||||
pr_err("invalid voltage range (%d, %d) uV\n", min_uV, max_uV);
|
||||
@ -216,17 +211,13 @@ static int da9030_set_ldo14_voltage(struct regulator_dev *rdev,
|
||||
|
||||
thresh = (info->max_uV + info->desc.min_uV) / 2;
|
||||
if (min_uV < thresh) {
|
||||
val = DIV_ROUND_UP(thresh - min_uV, info->desc.uV_step);
|
||||
val |= 0x4;
|
||||
sel = DIV_ROUND_UP(thresh - min_uV, info->desc.uV_step);
|
||||
sel |= 0x4;
|
||||
} else {
|
||||
val = DIV_ROUND_UP(min_uV - thresh, info->desc.uV_step);
|
||||
sel = DIV_ROUND_UP(min_uV - thresh, info->desc.uV_step);
|
||||
}
|
||||
|
||||
*selector = val;
|
||||
val <<= info->vol_shift;
|
||||
mask = ((1 << info->vol_nbits) - 1) << info->vol_shift;
|
||||
|
||||
return da903x_update(da903x_dev, info->vol_reg, val, mask);
|
||||
return sel;
|
||||
}
|
||||
|
||||
static int da9030_get_ldo14_voltage_sel(struct regulator_dev *rdev)
|
||||
@ -266,22 +257,15 @@ static int da9030_list_ldo14_voltage(struct regulator_dev *rdev,
|
||||
}
|
||||
|
||||
/* DA9034 specific operations */
|
||||
static int da9034_set_dvc_voltage(struct regulator_dev *rdev,
|
||||
int min_uV, int max_uV, unsigned *selector)
|
||||
static int da9034_set_dvc_voltage_sel(struct regulator_dev *rdev,
|
||||
unsigned selector)
|
||||
{
|
||||
struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
|
||||
struct device *da9034_dev = to_da903x_dev(rdev);
|
||||
uint8_t val, mask;
|
||||
int ret;
|
||||
|
||||
if (check_range(info, min_uV, max_uV)) {
|
||||
pr_err("invalid voltage range (%d, %d) uV\n", min_uV, max_uV);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
val = DIV_ROUND_UP(min_uV - info->desc.min_uV, info->desc.uV_step);
|
||||
*selector = val;
|
||||
val <<= info->vol_shift;
|
||||
val = selector << info->vol_shift;
|
||||
mask = ((1 << info->vol_nbits) - 1) << info->vol_shift;
|
||||
|
||||
ret = da903x_update(da9034_dev, info->vol_reg, val, mask);
|
||||
@ -293,25 +277,34 @@ static int da9034_set_dvc_voltage(struct regulator_dev *rdev,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int da9034_set_ldo12_voltage(struct regulator_dev *rdev,
|
||||
int min_uV, int max_uV, unsigned *selector)
|
||||
static int da9034_set_ldo12_voltage_sel(struct regulator_dev *rdev,
|
||||
unsigned selector)
|
||||
{
|
||||
struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
|
||||
struct device *da9034_dev = to_da903x_dev(rdev);
|
||||
uint8_t val, mask;
|
||||
|
||||
val = selector << info->vol_shift;
|
||||
mask = ((1 << info->vol_nbits) - 1) << info->vol_shift;
|
||||
|
||||
return da903x_update(da9034_dev, info->vol_reg, val, mask);
|
||||
}
|
||||
|
||||
static int da9034_map_ldo12_voltage(struct regulator_dev *rdev,
|
||||
int min_uV, int max_uV)
|
||||
{
|
||||
struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
|
||||
int sel;
|
||||
|
||||
if (check_range(info, min_uV, max_uV)) {
|
||||
pr_err("invalid voltage range (%d, %d) uV\n", min_uV, max_uV);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
val = DIV_ROUND_UP(min_uV - info->desc.min_uV, info->desc.uV_step);
|
||||
val = (val >= 20) ? val - 12 : ((val > 7) ? 8 : val);
|
||||
*selector = val;
|
||||
val <<= info->vol_shift;
|
||||
mask = ((1 << info->vol_nbits) - 1) << info->vol_shift;
|
||||
sel = DIV_ROUND_UP(min_uV - info->desc.min_uV, info->desc.uV_step);
|
||||
sel = (sel >= 20) ? sel - 12 : ((sel > 7) ? 8 : sel);
|
||||
|
||||
return da903x_update(da9034_dev, info->vol_reg, val, mask);
|
||||
return sel;
|
||||
}
|
||||
|
||||
static int da9034_get_ldo12_voltage_sel(struct regulator_dev *rdev)
|
||||
@ -349,9 +342,10 @@ static int da9034_list_ldo12_voltage(struct regulator_dev *rdev,
|
||||
}
|
||||
|
||||
static struct regulator_ops da903x_regulator_ldo_ops = {
|
||||
.set_voltage = da903x_set_ldo_voltage,
|
||||
.set_voltage_sel = da903x_set_ldo_voltage_sel,
|
||||
.get_voltage_sel = da903x_get_voltage_sel,
|
||||
.list_voltage = regulator_list_voltage_linear,
|
||||
.map_voltage = regulator_map_voltage_linear,
|
||||
.enable = da903x_enable,
|
||||
.disable = da903x_disable,
|
||||
.is_enabled = da903x_is_enabled,
|
||||
@ -359,9 +353,10 @@ static struct regulator_ops da903x_regulator_ldo_ops = {
|
||||
|
||||
/* NOTE: this is dedicated for the insane DA9030 LDO14 */
|
||||
static struct regulator_ops da9030_regulator_ldo14_ops = {
|
||||
.set_voltage = da9030_set_ldo14_voltage,
|
||||
.set_voltage_sel = da9030_set_ldo14_voltage_sel,
|
||||
.get_voltage_sel = da9030_get_ldo14_voltage_sel,
|
||||
.list_voltage = da9030_list_ldo14_voltage,
|
||||
.map_voltage = da9030_map_ldo14_voltage,
|
||||
.enable = da903x_enable,
|
||||
.disable = da903x_disable,
|
||||
.is_enabled = da903x_is_enabled,
|
||||
@ -369,18 +364,20 @@ static struct regulator_ops da9030_regulator_ldo14_ops = {
|
||||
|
||||
/* NOTE: this is dedicated for the DA9030 LDO1 and LDO15 that have locks */
|
||||
static struct regulator_ops da9030_regulator_ldo1_15_ops = {
|
||||
.set_voltage = da9030_set_ldo1_15_voltage,
|
||||
.set_voltage_sel = da9030_set_ldo1_15_voltage_sel,
|
||||
.get_voltage_sel = da903x_get_voltage_sel,
|
||||
.list_voltage = regulator_list_voltage_linear,
|
||||
.map_voltage = regulator_map_voltage_linear,
|
||||
.enable = da903x_enable,
|
||||
.disable = da903x_disable,
|
||||
.is_enabled = da903x_is_enabled,
|
||||
};
|
||||
|
||||
static struct regulator_ops da9034_regulator_dvc_ops = {
|
||||
.set_voltage = da9034_set_dvc_voltage,
|
||||
.set_voltage_sel = da9034_set_dvc_voltage_sel,
|
||||
.get_voltage_sel = da903x_get_voltage_sel,
|
||||
.list_voltage = regulator_list_voltage_linear,
|
||||
.map_voltage = regulator_map_voltage_linear,
|
||||
.enable = da903x_enable,
|
||||
.disable = da903x_disable,
|
||||
.is_enabled = da903x_is_enabled,
|
||||
@ -388,9 +385,10 @@ static struct regulator_ops da9034_regulator_dvc_ops = {
|
||||
|
||||
/* NOTE: this is dedicated for the insane LDO12 */
|
||||
static struct regulator_ops da9034_regulator_ldo12_ops = {
|
||||
.set_voltage = da9034_set_ldo12_voltage,
|
||||
.set_voltage_sel = da9034_set_ldo12_voltage_sel,
|
||||
.get_voltage_sel = da9034_get_ldo12_voltage_sel,
|
||||
.list_voltage = da9034_list_ldo12_voltage,
|
||||
.map_voltage = da9034_map_ldo12_voltage,
|
||||
.enable = da903x_enable,
|
||||
.disable = da903x_disable,
|
||||
.is_enabled = da903x_is_enabled,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user