Skip to content

Commit

Permalink
Merge remote-tracking branch 'regulator/topic/min' into regulator-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Dec 10, 2012
2 parents 9e21867 + e1b0144 commit adca48f
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 256 deletions.
28 changes: 9 additions & 19 deletions drivers/regulator/anatop-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,36 +48,21 @@ static int anatop_regmap_set_voltage_sel(struct regulator_dev *reg,
unsigned selector)
{
struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
u32 val, mask;

if (!anatop_reg->control_reg)
return -ENOTSUPP;

val = anatop_reg->min_bit_val + selector;
dev_dbg(&reg->dev, "%s: calculated val %d\n", __func__, val);
mask = ((1 << anatop_reg->vol_bit_width) - 1) <<
anatop_reg->vol_bit_shift;
val <<= anatop_reg->vol_bit_shift;
regmap_update_bits(anatop_reg->anatop, anatop_reg->control_reg,
mask, val);

return 0;
return regulator_set_voltage_sel_regmap(reg, selector);
}

static int anatop_regmap_get_voltage_sel(struct regulator_dev *reg)
{
struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
u32 val, mask;

if (!anatop_reg->control_reg)
return -ENOTSUPP;

regmap_read(anatop_reg->anatop, anatop_reg->control_reg, &val);
mask = ((1 << anatop_reg->vol_bit_width) - 1) <<
anatop_reg->vol_bit_shift;
val = (val & mask) >> anatop_reg->vol_bit_shift;

return val - anatop_reg->min_bit_val;
return regulator_get_voltage_sel_regmap(reg);
}

static struct regulator_ops anatop_rops = {
Expand Down Expand Up @@ -158,15 +143,20 @@ static int anatop_regulator_probe(struct platform_device *pdev)
goto anatop_probe_end;
}

rdesc->n_voltages = (sreg->max_voltage - sreg->min_voltage)
/ 25000 + 1;
rdesc->n_voltages = (sreg->max_voltage - sreg->min_voltage) / 25000 + 1
+ sreg->min_bit_val;
rdesc->min_uV = sreg->min_voltage;
rdesc->uV_step = 25000;
rdesc->linear_min_sel = sreg->min_bit_val;
rdesc->vsel_reg = sreg->control_reg;
rdesc->vsel_mask = ((1 << sreg->vol_bit_width) - 1) <<
sreg->vol_bit_shift;

config.dev = &pdev->dev;
config.init_data = initdata;
config.driver_data = sreg;
config.of_node = pdev->dev.of_node;
config.regmap = sreg->anatop;

/* register regulator */
rdev = regulator_register(rdesc, &config);
Expand Down
6 changes: 6 additions & 0 deletions drivers/regulator/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1924,6 +1924,10 @@ int regulator_list_voltage_linear(struct regulator_dev *rdev,
{
if (selector >= rdev->desc->n_voltages)
return -EINVAL;
if (selector < rdev->desc->linear_min_sel)
return 0;

selector -= rdev->desc->linear_min_sel;

return rdev->desc->min_uV + (rdev->desc->uV_step * selector);
}
Expand Down Expand Up @@ -2152,6 +2156,8 @@ int regulator_map_voltage_linear(struct regulator_dev *rdev,
if (ret < 0)
return ret;

ret += rdev->desc->linear_min_sel;

/* Map back into a voltage to verify we're still in bounds */
voltage = rdev->desc->ops->list_voltage(rdev, ret);
if (voltage < min_uV || voltage > max_uV)
Expand Down
55 changes: 8 additions & 47 deletions drivers/regulator/da9055-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ struct da9055_volt_reg {
int reg_a;
int reg_b;
int sl_shift;
int v_offset;
int v_mask;
int v_shift;
};
Expand Down Expand Up @@ -201,41 +200,6 @@ static int da9055_buck_set_current_limit(struct regulator_dev *rdev, int min_uA,
return -EINVAL;
}

static int da9055_list_voltage(struct regulator_dev *rdev, unsigned selector)
{
struct da9055_regulator *regulator = rdev_get_drvdata(rdev);
struct da9055_regulator_info *info = regulator->info;

if (selector >= rdev->desc->n_voltages)
return -EINVAL;

if (selector < info->volt.v_offset)
return 0;

selector -= info->volt.v_offset;
return rdev->desc->min_uV + (rdev->desc->uV_step * selector);
}

static int da9055_map_voltage(struct regulator_dev *rdev, int min_uV,
int max_uV)
{
struct da9055_regulator *regulator = rdev_get_drvdata(rdev);
struct da9055_regulator_info *info = regulator->info;
int sel, voltage;

if (min_uV < rdev->desc->min_uV)
min_uV = rdev->desc->min_uV;

sel = DIV_ROUND_UP(min_uV - rdev->desc->min_uV, rdev->desc->uV_step);
sel += info->volt.v_offset;

voltage = da9055_list_voltage(rdev, sel);
if (voltage < min_uV || voltage > max_uV)
return -EINVAL;

return sel;
}

static int da9055_regulator_get_voltage_sel(struct regulator_dev *rdev)
{
struct da9055_regulator *regulator = rdev_get_drvdata(rdev);
Expand Down Expand Up @@ -264,10 +228,7 @@ static int da9055_regulator_get_voltage_sel(struct regulator_dev *rdev)
return ret;

sel = (ret & volt.v_mask);
if (sel <= volt.v_offset)
return 0;
else
return sel;
return sel;
}

static int da9055_regulator_set_voltage_sel(struct regulator_dev *rdev,
Expand Down Expand Up @@ -328,7 +289,7 @@ static int da9055_regulator_set_suspend_voltage(struct regulator_dev *rdev,
return ret;
}

ret = da9055_map_voltage(rdev, uV, uV);
ret = regulator_map_voltage_linear(rdev, uV, uV);
if (ret < 0)
return ret;

Expand Down Expand Up @@ -371,8 +332,8 @@ static struct regulator_ops da9055_buck_ops = {

.get_voltage_sel = da9055_regulator_get_voltage_sel,
.set_voltage_sel = da9055_regulator_set_voltage_sel,
.list_voltage = da9055_list_voltage,
.map_voltage = da9055_map_voltage,
.list_voltage = regulator_list_voltage_linear,
.map_voltage = regulator_map_voltage_linear,
.is_enabled = regulator_is_enabled_regmap,
.enable = regulator_enable_regmap,
.disable = regulator_disable_regmap,
Expand All @@ -389,8 +350,8 @@ static struct regulator_ops da9055_ldo_ops = {

.get_voltage_sel = da9055_regulator_get_voltage_sel,
.set_voltage_sel = da9055_regulator_set_voltage_sel,
.list_voltage = da9055_list_voltage,
.map_voltage = da9055_map_voltage,
.list_voltage = regulator_list_voltage_linear,
.map_voltage = regulator_map_voltage_linear,
.is_enabled = regulator_is_enabled_regmap,
.enable = regulator_enable_regmap,
.disable = regulator_disable_regmap,
Expand All @@ -414,6 +375,7 @@ static struct regulator_ops da9055_ldo_ops = {
.enable_mask = 1, \
.min_uV = (min) * 1000,\
.uV_step = (step) * 1000,\
.linear_min_sel = (voffset),\
.owner = THIS_MODULE,\
},\
.conf = {\
Expand All @@ -425,7 +387,6 @@ static struct regulator_ops da9055_ldo_ops = {
.reg_a = DA9055_REG_VBCORE_A + DA9055_ID_##_id, \
.reg_b = DA9055_REG_VBCORE_B + DA9055_ID_##_id, \
.sl_shift = 7,\
.v_offset = (voffset),\
.v_mask = (1 << (vbits)) - 1,\
.v_shift = (vbits),\
},\
Expand All @@ -443,6 +404,7 @@ static struct regulator_ops da9055_ldo_ops = {
.enable_mask = 1,\
.min_uV = (min) * 1000,\
.uV_step = (step) * 1000,\
.linear_min_sel = (voffset),\
.owner = THIS_MODULE,\
},\
.conf = {\
Expand All @@ -454,7 +416,6 @@ static struct regulator_ops da9055_ldo_ops = {
.reg_a = DA9055_REG_VBCORE_A + DA9055_ID_##_id, \
.reg_b = DA9055_REG_VBCORE_B + DA9055_ID_##_id, \
.sl_shift = 7,\
.v_offset = (voffset),\
.v_mask = (1 << (vbits)) - 1,\
.v_shift = (vbits),\
},\
Expand Down
37 changes: 5 additions & 32 deletions drivers/regulator/palmas-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,44 +436,14 @@ static int palmas_is_enabled_ldo(struct regulator_dev *dev)
return !!(reg);
}

static int palmas_list_voltage_ldo(struct regulator_dev *dev,
unsigned selector)
{
if (!selector)
return 0;

/* voltage is 0.85V + (selector * 0.05v) */
return 850000 + (selector * 50000);
}

static int palmas_map_voltage_ldo(struct regulator_dev *rdev,
int min_uV, int max_uV)
{
int ret, voltage;

if (min_uV == 0)
return 0;

if (min_uV < 900000)
min_uV = 900000;
ret = DIV_ROUND_UP(min_uV - 900000, 50000) + 1;

/* Map back into a voltage to verify we're still in bounds */
voltage = palmas_list_voltage_ldo(rdev, ret);
if (voltage < min_uV || voltage > max_uV)
return -EINVAL;

return ret;
}

static struct regulator_ops palmas_ops_ldo = {
.is_enabled = palmas_is_enabled_ldo,
.enable = regulator_enable_regmap,
.disable = regulator_disable_regmap,
.get_voltage_sel = regulator_get_voltage_sel_regmap,
.set_voltage_sel = regulator_set_voltage_sel_regmap,
.list_voltage = palmas_list_voltage_ldo,
.map_voltage = palmas_map_voltage_ldo,
.list_voltage = regulator_list_voltage_linear,
.map_voltage = regulator_map_voltage_linear,
};

/*
Expand Down Expand Up @@ -821,6 +791,9 @@ static int palmas_probe(struct platform_device *pdev)

pmic->desc[id].type = REGULATOR_VOLTAGE;
pmic->desc[id].owner = THIS_MODULE;
pmic->desc[id].min_uV = 900000;
pmic->desc[id].uV_step = 50000;
pmic->desc[id].linear_min_sel = 1;
pmic->desc[id].vsel_reg = PALMAS_BASE_TO_REG(PALMAS_LDO_BASE,
palmas_regs_info[id].vsel_addr);
pmic->desc[id].vsel_mask = PALMAS_LDO1_VOLTAGE_VSEL_MASK;
Expand Down
Loading

0 comments on commit adca48f

Please sign in to comment.