shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

regulator: rk806: fix up the regulator_is_enabled return error

Browse Source 
Use rk806_regulator_is_enabled_regmap() to replace regulator_is_enabled_regmap().

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Ia6aae397ffcbfd7dbd7f45d3defa8544be32e6ad
This commit is contained in:
shengfei Xu
2021-11-14 12:18:52 +00:00
committed by Tao Huang
parent 842c51cac6
commit acd264533a
1 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
drivers/regulator/rk806-regulator.c
View File

@@ -821,49 +821,93 @@ static int rk806_set_voltage(struct regulator_dev *rdev,
return ret;
}
static int rk806_regulator_enable_regmap(struct regulator_dev *rdev)
static int rk806_regulator_is_enabled_regmap(struct regulator_dev *rdev)
{
struct rk806_regulator_data *pdata = rdev_get_drvdata(rdev);
struct rk806 *rk806 = pdata->rk806;
int rid = rdev_get_id(rdev);
int enable_reg;
int gpio_level, pid;
unsigned int val;
int mode;
mode = get_dvs_mode(rdev);
if (mode == RK806_DVS_NOT_SUPPORT)
return regulator_enable_regmap(rdev);
if ((mode >= RK806_DVS_BY_CTR_PIN1) &&
(mode <= RK806_DVS_BY_CTR_PIN3)) {
enable_reg = rdev->desc->enable_reg + 6 + rid / 8;
val = BIT(rid % 8);
pid = get_gpio_id(rdev);
gpio_level = gpio_get_value(pdata->dvs_gpios[pid]);
regmap_update_bits(rdev->regmap, enable_reg, val, val);
if (gpio_level == 1) {
return rk806_field_read(rk806, pdata->dvs_field[rid].sleep_en);
} else {
val = rk806_field_read(rk806, pdata->dvs_field[rid].en_reg);
return val & rdev->desc->enable_val;
}
}
return regulator_enable_regmap(rdev);
val = rk806_field_read(rk806, pdata->dvs_field[rid].en_reg);
return val & rdev->desc->enable_val;
}
static int rk806_regulator_enable_regmap(struct regulator_dev *rdev)
{
struct rk806_regulator_data *pdata = rdev_get_drvdata(rdev);
struct rk806 *rk806 = pdata->rk806;
int rid = rdev_get_id(rdev);
int gpio_level, pid;
int mode;
mode = get_dvs_mode(rdev);
if ((mode >= RK806_DVS_BY_CTR_PIN1) &&
(mode <= RK806_DVS_BY_CTR_PIN3)) {
pid = get_gpio_id(rdev);
gpio_level = gpio_get_value(pdata->dvs_gpios[pid]);
if (gpio_level == 1)
return rk806_field_write(rk806,
pdata->dvs_field[rid].sleep_en,
0x01);
else
return rk806_field_write(rk806,
pdata->dvs_field[rid].en_reg,
rdev->desc->enable_val);
}
return rk806_field_write(rk806,
pdata->dvs_field[rid].en_reg,
rdev->desc->enable_val);
}
static int rk806_regulator_disable_regmap(struct regulator_dev *rdev)
{
struct rk806_regulator_data *pdata = rdev_get_drvdata(rdev);
struct rk806 *rk806 = pdata->rk806;
int rid = rdev_get_id(rdev);
int enable_reg;
unsigned int val;
int gpio_level, pid;
int mode;
mode = get_dvs_mode(rdev);
if (mode == RK806_DVS_NOT_SUPPORT)
return regulator_disable_regmap(rdev);
if ((mode >= RK806_DVS_BY_CTR_PIN1) &&
(mode <= RK806_DVS_BY_CTR_PIN3)) {
enable_reg = rdev->desc->enable_reg + 6 + rid / 8;
val = BIT(rid % 8);
pid = get_gpio_id(rdev);
gpio_level = gpio_get_value(pdata->dvs_gpios[pid]);
regmap_update_bits(rdev->regmap, enable_reg, val, 0);
if (gpio_level == 1)
return rk806_field_write(rk806,
pdata->dvs_field[rid].sleep_en,
0x00);
else
return rk806_field_write(rk806,
pdata->dvs_field[rid].en_reg,
rdev->desc->disable_val);
}
return regulator_disable_regmap(rdev);
return rk806_field_write(rk806,
pdata->dvs_field[rid].en_reg,
rdev->desc->disable_val);
}
static int rk806_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
@@ -956,7 +1000,7 @@ static const struct regulator_ops rk806_ops_dcdc = {
.enable = rk806_regulator_enable_regmap,
.disable = rk806_regulator_disable_regmap,
.is_enabled = regulator_is_enabled_regmap,
.is_enabled = rk806_regulator_is_enabled_regmap,
.set_suspend_mode = rk806_set_mode,
.set_ramp_delay = rk806_set_ramp_delay,
@@ -977,7 +1021,7 @@ static const struct regulator_ops rk806_ops_ldo = {
.enable = rk806_regulator_enable_regmap,
.disable = rk806_regulator_disable_regmap,
.is_enabled = regulator_is_enabled_regmap,
.is_enabled = rk806_regulator_is_enabled_regmap,
.set_suspend_mode = rk806_set_mode,
.set_ramp_delay = rk806_set_ramp_delay,