Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 302296
b: refs/heads/master
c: c972a02
h: refs/heads/master
v: v3
  • Loading branch information
Axel Lin authored and Mark Brown committed May 15, 2012
1 parent 9c35fe8 commit b273c19
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 57 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 70b4e7862d604aa6ae30a772830670bf7288ec42
refs/heads/master: c972a029483ac5a546a6405e30e4eede6fbd19f9
110 changes: 54 additions & 56 deletions trunk/drivers/regulator/da903x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand All @@ -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);
Expand All @@ -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)
Expand Down Expand Up @@ -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);
Expand All @@ -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)
Expand Down Expand Up @@ -349,48 +342,53 @@ 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,
};

/* 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,
};

/* 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,
};

/* 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,
Expand Down

0 comments on commit b273c19

Please sign in to comment.