Skip to content

L
linux
Commit faa95fde authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files
Options

regulator: tps65910: Remvoe tps65910_reg_[read|modify_bits|read_locked|write_locked] functions 

The tps65910 mfd driver has been converted to regmap APIs.
This patch adds tps65910_reg_update_bits() in include/linux/mfd/tps65910.h.
Thus we can use tps65910_reg_read/tps65910_reg_write/tps65910_reg_update_bits
directly and remove tps65910_reg_[read|modify_bits|read_locked|write_locked]
functions. With this change, we can also remove the mutex in struct tps65910_reg.
Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Tested-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent cb74685e
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 111 deletions
drivers/regulator/tps65910-regulator.c
View file @ faa95fde
...@@ -296,7 +296,6 @@ struct tps65910_reg { ...@@ -296,7 +296,6 @@ struct tps65910_reg {
struct tps65910 *mfd; struct tps65910 *mfd;
struct regulator_dev **rdev; struct regulator_dev **rdev;
struct tps_info **info; struct tps_info **info;
struct mutex mutex;
int num_regulators; int num_regulators;
int mode; int mode;
int (*get_ctrl_reg)(int); int (*get_ctrl_reg)(int);
...@@ -304,71 +303,6 @@ struct tps65910_reg { ...@@ -304,71 +303,6 @@ struct tps65910_reg {
unsigned int board_ext_control[TPS65910_NUM_REGS]; unsigned int board_ext_control[TPS65910_NUM_REGS];
}; };
static inline int tps65910_read(struct tps65910_reg *pmic, u8 reg)
{
unsigned int val;
int err;
err = tps65910_reg_read(pmic->mfd, reg, &val);
if (err)
return err;
return val;
}
static int tps65910_modify_bits(struct tps65910_reg *pmic, u8 reg,
u8 set_mask, u8 clear_mask)
{
int err, data;
mutex_lock(&pmic->mutex);
data = tps65910_read(pmic, reg);
if (data < 0) {
dev_err(pmic->mfd->dev, "Read from reg 0x%x failed\n", reg);
err = data;
goto out;
}
data &= ~clear_mask;
data |= set_mask;
err = tps65910_reg_write(pmic->mfd, reg, data);
if (err)
dev_err(pmic->mfd->dev, "Write for reg 0x%x failed\n", reg);
out:
mutex_unlock(&pmic->mutex);
return err;
}
static int tps65910_reg_read_locked(struct tps65910_reg *pmic, u8 reg)
{
int data;
mutex_lock(&pmic->mutex);
data = tps65910_read(pmic, reg);
if (data < 0)
dev_err(pmic->mfd->dev, "Read from reg 0x%x failed\n", reg);
mutex_unlock(&pmic->mutex);
return data;
}
static int tps65910_reg_write_locked(struct tps65910_reg *pmic, u8 reg, u8 val)
{
int err;
mutex_lock(&pmic->mutex);
err = tps65910_reg_write(pmic->mfd, reg, val);
if (err < 0)
dev_err(pmic->mfd->dev, "Write for reg 0x%x failed\n", reg);
mutex_unlock(&pmic->mutex);
return err;
}
static int tps65910_get_ctrl_register(int id) static int tps65910_get_ctrl_register(int id)
{ {
switch (id) { switch (id) {
...@@ -449,8 +383,9 @@ static int tps65910_set_mode(struct regulator_dev *dev, unsigned int mode) ...@@ -449,8 +383,9 @@ static int tps65910_set_mode(struct regulator_dev *dev, unsigned int mode)
switch (mode) { switch (mode) {
case REGULATOR_MODE_NORMAL: case REGULATOR_MODE_NORMAL:
return tps65910_modify_bits(pmic, reg, LDO_ST_ON_BIT, return tps65910_reg_update_bits(pmic->mfd, reg,
LDO_ST_MODE_BIT); LDO_ST_MODE_BIT | LDO_ST_ON_BIT,
LDO_ST_ON_BIT);
case REGULATOR_MODE_IDLE: case REGULATOR_MODE_IDLE:
value = LDO_ST_ON_BIT | LDO_ST_MODE_BIT; value = LDO_ST_ON_BIT | LDO_ST_MODE_BIT;
return tps65910_reg_set_bits(mfd, reg, value); return tps65910_reg_set_bits(mfd, reg, value);
...@@ -464,15 +399,15 @@ static int tps65910_set_mode(struct regulator_dev *dev, unsigned int mode) ...@@ -464,15 +399,15 @@ static int tps65910_set_mode(struct regulator_dev *dev, unsigned int mode)
static unsigned int tps65910_get_mode(struct regulator_dev *dev) static unsigned int tps65910_get_mode(struct regulator_dev *dev)
{ {
struct tps65910_reg *pmic = rdev_get_drvdata(dev); struct tps65910_reg *pmic = rdev_get_drvdata(dev);
int reg, value, id = rdev_get_id(dev); int ret, reg, value, id = rdev_get_id(dev);
reg = pmic->get_ctrl_reg(id); reg = pmic->get_ctrl_reg(id);
if (reg < 0) if (reg < 0)
return reg; return reg;
value = tps65910_reg_read_locked(pmic, reg); ret = tps65910_reg_read(pmic->mfd, reg, &value);
if (value < 0) if (ret < 0)
return value; return ret;
if (!(value & LDO_ST_ON_BIT)) if (!(value & LDO_ST_ON_BIT))
return REGULATOR_MODE_STANDBY; return REGULATOR_MODE_STANDBY;
...@@ -485,33 +420,51 @@ static unsigned int tps65910_get_mode(struct regulator_dev *dev) ...@@ -485,33 +420,51 @@ static unsigned int tps65910_get_mode(struct regulator_dev *dev)
static int tps65910_get_voltage_dcdc_sel(struct regulator_dev *dev) static int tps65910_get_voltage_dcdc_sel(struct regulator_dev *dev)
{ {
struct tps65910_reg *pmic = rdev_get_drvdata(dev); struct tps65910_reg *pmic = rdev_get_drvdata(dev);
int id = rdev_get_id(dev); int ret, id = rdev_get_id(dev);
int opvsel = 0, srvsel = 0, vselmax = 0, mult = 0, sr = 0; int opvsel = 0, srvsel = 0, vselmax = 0, mult = 0, sr = 0;
switch (id) { switch (id) {
case TPS65910_REG_VDD1: case TPS65910_REG_VDD1:
opvsel = tps65910_reg_read_locked(pmic, TPS65910_VDD1_OP); ret = tps65910_reg_read(pmic->mfd, TPS65910_VDD1_OP, &opvsel);
mult = tps65910_reg_read_locked(pmic, TPS65910_VDD1); if (ret < 0)
return ret;
ret = tps65910_reg_read(pmic->mfd, TPS65910_VDD1, &mult);
if (ret < 0)
return ret;
mult = (mult & VDD1_VGAIN_SEL_MASK) >> VDD1_VGAIN_SEL_SHIFT; mult = (mult & VDD1_VGAIN_SEL_MASK) >> VDD1_VGAIN_SEL_SHIFT;
srvsel = tps65910_reg_read_locked(pmic, TPS65910_VDD1_SR); ret = tps65910_reg_read(pmic->mfd, TPS65910_VDD1_SR, &srvsel);
if (ret < 0)
return ret;
sr = opvsel & VDD1_OP_CMD_MASK; sr = opvsel & VDD1_OP_CMD_MASK;
opvsel &= VDD1_OP_SEL_MASK; opvsel &= VDD1_OP_SEL_MASK;
srvsel &= VDD1_SR_SEL_MASK; srvsel &= VDD1_SR_SEL_MASK;
vselmax = 75; vselmax = 75;
break; break;
case TPS65910_REG_VDD2: case TPS65910_REG_VDD2:
opvsel = tps65910_reg_read_locked(pmic, TPS65910_VDD2_OP); ret = tps65910_reg_read(pmic->mfd, TPS65910_VDD2_OP, &opvsel);
mult = tps65910_reg_read_locked(pmic, TPS65910_VDD2); if (ret < 0)
return ret;
ret = tps65910_reg_read(pmic->mfd, TPS65910_VDD2, &mult);
if (ret < 0)
return ret;
mult = (mult & VDD2_VGAIN_SEL_MASK) >> VDD2_VGAIN_SEL_SHIFT; mult = (mult & VDD2_VGAIN_SEL_MASK) >> VDD2_VGAIN_SEL_SHIFT;
srvsel = tps65910_reg_read_locked(pmic, TPS65910_VDD2_SR); ret = tps65910_reg_read(pmic->mfd, TPS65910_VDD2_SR, &srvsel);
if (ret < 0)
return ret;
sr = opvsel & VDD2_OP_CMD_MASK; sr = opvsel & VDD2_OP_CMD_MASK;
opvsel &= VDD2_OP_SEL_MASK; opvsel &= VDD2_OP_SEL_MASK;
srvsel &= VDD2_SR_SEL_MASK; srvsel &= VDD2_SR_SEL_MASK;
vselmax = 75; vselmax = 75;
break; break;
case TPS65911_REG_VDDCTRL: case TPS65911_REG_VDDCTRL:
opvsel = tps65910_reg_read_locked(pmic, TPS65911_VDDCTRL_OP); ret = tps65910_reg_read(pmic->mfd, TPS65911_VDDCTRL_OP,
srvsel = tps65910_reg_read_locked(pmic, TPS65911_VDDCTRL_SR); &opvsel);
if (ret < 0)
return ret;
ret = tps65910_reg_read(pmic->mfd, TPS65911_VDDCTRL_SR,
&srvsel);
if (ret < 0)
return ret;
sr = opvsel & VDDCTRL_OP_CMD_MASK; sr = opvsel & VDDCTRL_OP_CMD_MASK;
opvsel &= VDDCTRL_OP_SEL_MASK; opvsel &= VDDCTRL_OP_SEL_MASK;
srvsel &= VDDCTRL_SR_SEL_MASK; srvsel &= VDDCTRL_SR_SEL_MASK;
...@@ -545,15 +498,15 @@ static int tps65910_get_voltage_dcdc_sel(struct regulator_dev *dev) ...@@ -545,15 +498,15 @@ static int tps65910_get_voltage_dcdc_sel(struct regulator_dev *dev)
static int tps65910_get_voltage_sel(struct regulator_dev *dev) static int tps65910_get_voltage_sel(struct regulator_dev *dev)
{ {
struct tps65910_reg *pmic = rdev_get_drvdata(dev); struct tps65910_reg *pmic = rdev_get_drvdata(dev);
int reg, value, id = rdev_get_id(dev); int ret, reg, value, id = rdev_get_id(dev);
reg = pmic->get_ctrl_reg(id); reg = pmic->get_ctrl_reg(id);
if (reg < 0) if (reg < 0)
return reg; return reg;
value = tps65910_reg_read_locked(pmic, reg); ret = tps65910_reg_read(pmic->mfd, reg, &value);
if (value < 0) if (ret < 0)
return value; return ret;
switch (id) { switch (id) {
case TPS65910_REG_VIO: case TPS65910_REG_VIO:
...@@ -583,12 +536,14 @@ static int tps65910_get_voltage_vdd3(struct regulator_dev *dev) ...@@ -583,12 +536,14 @@ static int tps65910_get_voltage_vdd3(struct regulator_dev *dev)
static int tps65911_get_voltage_sel(struct regulator_dev *dev) static int tps65911_get_voltage_sel(struct regulator_dev *dev)
{ {
struct tps65910_reg *pmic = rdev_get_drvdata(dev); struct tps65910_reg *pmic = rdev_get_drvdata(dev);
int id = rdev_get_id(dev); int ret, id = rdev_get_id(dev);
u8 value, reg; unsigned int value, reg;
reg = pmic->get_ctrl_reg(id); reg = pmic->get_ctrl_reg(id);
value = tps65910_reg_read_locked(pmic, reg); ret = tps65910_reg_read(pmic->mfd, reg, &value);
if (ret < 0)
return ret;
switch (id) { switch (id) {
case TPS65911_REG_LDO1: case TPS65911_REG_LDO1:
...@@ -630,10 +585,10 @@ static int tps65910_set_voltage_dcdc_sel(struct regulator_dev *dev, ...@@ -630,10 +585,10 @@ static int tps65910_set_voltage_dcdc_sel(struct regulator_dev *dev,
dcdc_mult--; dcdc_mult--;
vsel = (selector % VDD1_2_NUM_VOLT_FINE) + 3; vsel = (selector % VDD1_2_NUM_VOLT_FINE) + 3;
tps65910_modify_bits(pmic, TPS65910_VDD1, tps65910_reg_update_bits(pmic->mfd, TPS65910_VDD1,
(dcdc_mult << VDD1_VGAIN_SEL_SHIFT), VDD1_VGAIN_SEL_MASK,
VDD1_VGAIN_SEL_MASK); dcdc_mult << VDD1_VGAIN_SEL_SHIFT);
tps65910_reg_write_locked(pmic, TPS65910_VDD1_OP, vsel); tps65910_reg_write(pmic->mfd, TPS65910_VDD1_OP, vsel);
break; break;
case TPS65910_REG_VDD2: case TPS65910_REG_VDD2:
dcdc_mult = (selector / VDD1_2_NUM_VOLT_FINE) + 1; dcdc_mult = (selector / VDD1_2_NUM_VOLT_FINE) + 1;
...@@ -641,14 +596,14 @@ static int tps65910_set_voltage_dcdc_sel(struct regulator_dev *dev, ...@@ -641,14 +596,14 @@ static int tps65910_set_voltage_dcdc_sel(struct regulator_dev *dev,
dcdc_mult--; dcdc_mult--;
vsel = (selector % VDD1_2_NUM_VOLT_FINE) + 3; vsel = (selector % VDD1_2_NUM_VOLT_FINE) + 3;
tps65910_modify_bits(pmic, TPS65910_VDD2, tps65910_reg_update_bits(pmic->mfd, TPS65910_VDD2,
(dcdc_mult << VDD2_VGAIN_SEL_SHIFT), VDD1_VGAIN_SEL_MASK,
VDD1_VGAIN_SEL_MASK); dcdc_mult << VDD2_VGAIN_SEL_SHIFT);
tps65910_reg_write_locked(pmic, TPS65910_VDD2_OP, vsel); tps65910_reg_write(pmic->mfd, TPS65910_VDD2_OP, vsel);
break; break;
case TPS65911_REG_VDDCTRL: case TPS65911_REG_VDDCTRL:
vsel = selector + 3; vsel = selector + 3;
tps65910_reg_write_locked(pmic, TPS65911_VDDCTRL_OP, vsel); tps65910_reg_write(pmic->mfd, TPS65911_VDDCTRL_OP, vsel);
} }
return 0; return 0;
...@@ -674,8 +629,8 @@ static int tps65910_set_voltage_sel(struct regulator_dev *dev, ...@@ -674,8 +629,8 @@ static int tps65910_set_voltage_sel(struct regulator_dev *dev,
case TPS65910_REG_VAUX2: case TPS65910_REG_VAUX2:
case TPS65910_REG_VAUX33: case TPS65910_REG_VAUX33:
case TPS65910_REG_VMMC: case TPS65910_REG_VMMC:
return tps65910_modify_bits(pmic, reg, return tps65910_reg_update_bits(pmic->mfd, reg, LDO_SEL_MASK,
(selector << LDO_SEL_SHIFT), LDO_SEL_MASK); selector << LDO_SEL_SHIFT);
} }
return -EINVAL; return -EINVAL;
...@@ -695,18 +650,18 @@ static int tps65911_set_voltage_sel(struct regulator_dev *dev, ...@@ -695,18 +650,18 @@ static int tps65911_set_voltage_sel(struct regulator_dev *dev,
case TPS65911_REG_LDO1: case TPS65911_REG_LDO1:
case TPS65911_REG_LDO2: case TPS65911_REG_LDO2:
case TPS65911_REG_LDO4: case TPS65911_REG_LDO4:
return tps65910_modify_bits(pmic, reg, return tps65910_reg_update_bits(pmic->mfd, reg, LDO1_SEL_MASK,
(selector << LDO_SEL_SHIFT), LDO1_SEL_MASK); selector << LDO_SEL_SHIFT);
case TPS65911_REG_LDO3: case TPS65911_REG_LDO3:
case TPS65911_REG_LDO5: case TPS65911_REG_LDO5:
case TPS65911_REG_LDO6: case TPS65911_REG_LDO6:
case TPS65911_REG_LDO7: case TPS65911_REG_LDO7:
case TPS65911_REG_LDO8: case TPS65911_REG_LDO8:
return tps65910_modify_bits(pmic, reg, return tps65910_reg_update_bits(pmic->mfd, reg, LDO3_SEL_MASK,
(selector << LDO_SEL_SHIFT), LDO3_SEL_MASK); selector << LDO_SEL_SHIFT);
case TPS65910_REG_VIO: case TPS65910_REG_VIO:
return tps65910_modify_bits(pmic, reg, return tps65910_reg_update_bits(pmic->mfd, reg, LDO_SEL_MASK,
(selector << LDO_SEL_SHIFT), LDO_SEL_MASK); selector << LDO_SEL_SHIFT);
} }
return -EINVAL; return -EINVAL;
...@@ -918,11 +873,19 @@ static int tps65910_set_ext_sleep_config(struct tps65910_reg *pmic, ...@@ -918,11 +873,19 @@ static int tps65910_set_ext_sleep_config(struct tps65910_reg *pmic,
(tps65910_chip_id(mfd) == TPS65911))) { (tps65910_chip_id(mfd) == TPS65911))) {
int op_reg_add = pmic->get_ctrl_reg(id) + 1; int op_reg_add = pmic->get_ctrl_reg(id) + 1;
int sr_reg_add = pmic->get_ctrl_reg(id) + 2; int sr_reg_add = pmic->get_ctrl_reg(id) + 2;
int opvsel = tps65910_reg_read_locked(pmic, op_reg_add); int opvsel, srvsel;
int srvsel = tps65910_reg_read_locked(pmic, sr_reg_add);
ret = tps65910_reg_read(pmic->mfd, op_reg_add, &opvsel);
if (ret < 0)
return ret;
ret = tps65910_reg_read(pmic->mfd, sr_reg_add, &srvsel);
if (ret < 0)
return ret;
if (opvsel & VDD1_OP_CMD_MASK) { if (opvsel & VDD1_OP_CMD_MASK) {
u8 reg_val = srvsel & VDD1_OP_SEL_MASK; u8 reg_val = srvsel & VDD1_OP_SEL_MASK;
ret = tps65910_reg_write_locked(pmic, op_reg_add,
ret = tps65910_reg_write(pmic->mfd, op_reg_add,
reg_val); reg_val);
if (ret < 0) { if (ret < 0) {
dev_err(mfd->dev, dev_err(mfd->dev,
...@@ -930,7 +893,7 @@ static int tps65910_set_ext_sleep_config(struct tps65910_reg *pmic, ...@@ -930,7 +893,7 @@ static int tps65910_set_ext_sleep_config(struct tps65910_reg *pmic,
return ret; return ret;
} }
} }
ret = tps65910_reg_write_locked(pmic, sr_reg_add, 0); ret = tps65910_reg_write(pmic->mfd, sr_reg_add, 0);
if (ret < 0) { if (ret < 0) {
dev_err(mfd->dev, "Error in settting sr register\n"); dev_err(mfd->dev, "Error in settting sr register\n");
return ret; return ret;
...@@ -1100,7 +1063,6 @@ static __devinit int tps65910_probe(struct platform_device *pdev) ...@@ -1100,7 +1063,6 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
mutex_init(&pmic->mutex);
pmic->mfd = tps65910; pmic->mfd = tps65910;
platform_set_drvdata(pdev, pmic); platform_set_drvdata(pdev, pmic);
......
include/linux/mfd/tps65910.h
View file @ faa95fde
...@@ -882,4 +882,10 @@ static inline int tps65910_reg_clear_bits(struct tps65910 *tps65910, u8 reg, ...@@ -882,4 +882,10 @@ static inline int tps65910_reg_clear_bits(struct tps65910 *tps65910, u8 reg,
return regmap_update_bits(tps65910->regmap, reg, mask, 0); return regmap_update_bits(tps65910->regmap, reg, mask, 0);
} }
static inline int tps65910_reg_update_bits(struct tps65910 *tps65910, u8 reg,
u8 mask, u8 val)
{
return regmap_update_bits(tps65910->regmap, reg, mask, val);
}
#endif /* __LINUX_MFD_TPS65910_H */ #endif /* __LINUX_MFD_TPS65910_H */
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