Skip to content

L
linux
Commit 32f53804 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Greg Kroah-Hartman
Browse files
Options

staging: regulator: hi6421v600-regulator: cleanup struct hisi_regulator 

There are several fields on this struct that can be removed,
as they already exists at struct regulator_desc.

Remove them, cleaning up the code in the process.

While here, rename it to hi6421v600_regulator_info, in order
to better match the driver's name.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/648d48f11368a9869d760c2bd54bfbc3feb4f44c.1597647359.git.mchehab+huawei@kernel.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 75937f8f
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 134 deletions
drivers/staging/hikey9xx/hi6421v600-regulator.c
View file @ 32f53804
...@@ -39,21 +39,11 @@ ...@@ -39,21 +39,11 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/spmi.h> #include <linux/spmi.h>
struct hisi_regulator_register_info { struct hi6421v600_regulator {
u32 ctrl_reg;
u32 enable_mask;
u32 eco_mode_mask;
u32 vset_reg;
u32 vset_mask;
};
struct hisi_regulator {
const char *name;
struct hisi_regulator_register_info register_info;
u32 off_on_delay;
u32 eco_uA;
struct regulator_desc rdesc; struct regulator_desc rdesc;
struct hisi_pmic *pmic; struct hisi_pmic *pmic;
u8 eco_mode_mask;
u32 eco_uA;
}; };
static DEFINE_MUTEX(enable_mutex); static DEFINE_MUTEX(enable_mutex);
...@@ -62,29 +52,29 @@ static DEFINE_MUTEX(enable_mutex); ...@@ -62,29 +52,29 @@ static DEFINE_MUTEX(enable_mutex);
* microseconds after 'since'. * microseconds after 'since'.
*/ */
static int hisi_regulator_is_enabled(struct regulator_dev *dev) static int hisi_regulator_is_enabled(struct regulator_dev *rdev)
{ {
u32 reg_val; u32 reg_val;
struct hisi_regulator *sreg = rdev_get_drvdata(dev); struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev);
struct hisi_pmic *pmic = sreg->pmic; struct hisi_pmic *pmic = sreg->pmic;
reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); reg_val = hisi_pmic_read(pmic, rdev->desc->enable_reg);
pr_debug("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", pr_debug("<[%s]: enable_reg=0x%x,enable_state=%d>\n",
__func__, sreg->register_info.ctrl_reg, __func__, rdev->desc->enable_reg,
(reg_val & sreg->register_info.enable_mask)); (reg_val & rdev->desc->enable_mask));
return ((reg_val & sreg->register_info.enable_mask) != 0); return ((reg_val & rdev->desc->enable_mask) != 0);
} }
static int hisi_regulator_enable(struct regulator_dev *dev) static int hisi_regulator_enable(struct regulator_dev *rdev)
{ {
struct hisi_regulator *sreg = rdev_get_drvdata(dev); struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev);
struct hisi_pmic *pmic = sreg->pmic; struct hisi_pmic *pmic = sreg->pmic;
/* keep a distance of off_on_delay from last time disabled */ /* keep a distance of off_on_delay from last time disabled */
usleep_range(sreg->off_on_delay, sreg->off_on_delay + 1000); usleep_range(rdev->desc->off_on_delay, rdev->desc->off_on_delay + 1000);
pr_debug("<[%s]: off_on_delay=%dus>\n", __func__, sreg->off_on_delay); pr_debug("<[%s]: off_on_delay=%dus>\n", __func__, rdev->desc->off_on_delay);
/* cannot enable more than one regulator at one time */ /* cannot enable more than one regulator at one time */
mutex_lock(&enable_mutex); mutex_lock(&enable_mutex);
...@@ -92,103 +82,103 @@ static int hisi_regulator_enable(struct regulator_dev *dev) ...@@ -92,103 +82,103 @@ static int hisi_regulator_enable(struct regulator_dev *dev)
HISI_REGS_ENA_PROTECT_TIME + 1000); HISI_REGS_ENA_PROTECT_TIME + 1000);
/* set enable register */ /* set enable register */
hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, hisi_pmic_rmw(pmic, rdev->desc->enable_reg,
sreg->register_info.enable_mask, rdev->desc->enable_mask,
sreg->register_info.enable_mask); rdev->desc->enable_mask);
pr_debug("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", pr_debug("<[%s]: enable_reg=0x%x,enable_mask=0x%x>\n",
__func__, sreg->register_info.ctrl_reg, __func__, rdev->desc->enable_reg,
sreg->register_info.enable_mask); rdev->desc->enable_mask);
mutex_unlock(&enable_mutex); mutex_unlock(&enable_mutex);
return 0; return 0;
} }
static int hisi_regulator_disable(struct regulator_dev *dev) static int hisi_regulator_disable(struct regulator_dev *rdev)
{ {
struct hisi_regulator *sreg = rdev_get_drvdata(dev); struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev);
struct hisi_pmic *pmic = sreg->pmic; struct hisi_pmic *pmic = sreg->pmic;
/* set enable register to 0 */ /* set enable register to 0 */
hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, hisi_pmic_rmw(pmic, rdev->desc->enable_reg,
sreg->register_info.enable_mask, 0); rdev->desc->enable_mask, 0);
return 0; return 0;
} }
static int hisi_regulator_get_voltage(struct regulator_dev *dev) static int hisi_regulator_get_voltage(struct regulator_dev *rdev)
{ {
struct hisi_regulator *sreg = rdev_get_drvdata(dev); struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev);
struct hisi_pmic *pmic = sreg->pmic; struct hisi_pmic *pmic = sreg->pmic;
u32 reg_val, selector; u32 reg_val, selector;
/* get voltage selector */ /* get voltage selector */
reg_val = hisi_pmic_read(pmic, sreg->register_info.vset_reg); reg_val = hisi_pmic_read(pmic, rdev->desc->vsel_reg);
pr_debug("<[%s]: vset_reg=0x%x>\n", pr_debug("<[%s]: vsel_reg=0x%x>\n",
__func__, sreg->register_info.vset_reg); __func__, rdev->desc->vsel_reg);
selector = (reg_val & sreg->register_info.vset_mask) >> selector = (reg_val & rdev->desc->vsel_mask) >>
(ffs(sreg->register_info.vset_mask) - 1); (ffs(rdev->desc->vsel_mask) - 1);
return sreg->rdesc.ops->list_voltage(dev, selector); return rdev->desc->ops->list_voltage(rdev, selector);
} }
static int hisi_regulator_set_voltage(struct regulator_dev *dev, static int hisi_regulator_set_voltage(struct regulator_dev *rdev,
int min_uV, int max_uV, unsigned int *selector) int min_uV, int max_uV, unsigned int *selector)
{ {
struct hisi_regulator *sreg = rdev_get_drvdata(dev); struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev);
struct hisi_pmic *pmic = sreg->pmic; struct hisi_pmic *pmic = sreg->pmic;
u32 vsel; u32 vsel;
int ret = 0; int ret = 0;
for (vsel = 0; vsel < sreg->rdesc.n_voltages; vsel++) { for (vsel = 0; vsel < rdev->desc->n_voltages; vsel++) {
int uV = sreg->rdesc.volt_table[vsel]; int uV = rdev->desc->volt_table[vsel];
/* Break at the first in-range value */ /* Break at the first in-range value */
if (min_uV <= uV && uV <= max_uV) if (min_uV <= uV && uV <= max_uV)
break; break;
} }
/* unlikely to happen. sanity test done by regulator core */ /* unlikely to happen. sanity test done by regulator core */
if (unlikely(vsel == sreg->rdesc.n_voltages)) if (unlikely(vsel == rdev->desc->n_voltages))
return -EINVAL; return -EINVAL;
*selector = vsel; *selector = vsel;
/* set voltage selector */ /* set voltage selector */
hisi_pmic_rmw(pmic, sreg->register_info.vset_reg, hisi_pmic_rmw(pmic, rdev->desc->vsel_reg,
sreg->register_info.vset_mask, rdev->desc->vsel_mask,
vsel << (ffs(sreg->register_info.vset_mask) - 1)); vsel << (ffs(rdev->desc->vsel_mask) - 1));
pr_debug("<[%s]: vset_reg=0x%x, vset_mask=0x%x, value=0x%x>\n", pr_debug("<[%s]: vsel_reg=0x%x, vsel_mask=0x%x, value=0x%x>\n",
__func__, __func__,
sreg->register_info.vset_reg, rdev->desc->vsel_reg,
sreg->register_info.vset_mask, rdev->desc->vsel_mask,
vsel << (ffs(sreg->register_info.vset_mask) - 1)); vsel << (ffs(rdev->desc->vsel_mask) - 1));
return ret; return ret;
} }
static unsigned int hisi_regulator_get_mode(struct regulator_dev *dev) static unsigned int hisi_regulator_get_mode(struct regulator_dev *rdev)
{ {
struct hisi_regulator *sreg = rdev_get_drvdata(dev); struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev);
struct hisi_pmic *pmic = sreg->pmic; struct hisi_pmic *pmic = sreg->pmic;
u32 reg_val; u32 reg_val;
reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); reg_val = hisi_pmic_read(pmic, rdev->desc->enable_reg);
pr_debug("<[%s]: reg_val=%d, ctrl_reg=0x%x, eco_mode_mask=0x%x>\n", pr_debug("<[%s]: reg_val=%d, enable_reg=0x%x, eco_mode_mask=0x%x>\n",
__func__, reg_val, __func__, reg_val,
sreg->register_info.ctrl_reg, rdev->desc->enable_reg,
sreg->register_info.eco_mode_mask); sreg->eco_mode_mask);
if (reg_val & sreg->register_info.eco_mode_mask) if (reg_val & sreg->eco_mode_mask)
return REGULATOR_MODE_IDLE; return REGULATOR_MODE_IDLE;
else else
return REGULATOR_MODE_NORMAL; return REGULATOR_MODE_NORMAL;
} }
static int hisi_regulator_set_mode(struct regulator_dev *dev, static int hisi_regulator_set_mode(struct regulator_dev *rdev,
unsigned int mode) unsigned int mode)
{ {
struct hisi_regulator *sreg = rdev_get_drvdata(dev); struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev);
struct hisi_pmic *pmic = sreg->pmic; struct hisi_pmic *pmic = sreg->pmic;
u32 eco_mode; u32 eco_mode;
...@@ -204,23 +194,23 @@ static int hisi_regulator_set_mode(struct regulator_dev *dev, ...@@ -204,23 +194,23 @@ static int hisi_regulator_set_mode(struct regulator_dev *dev,
} }
/* set mode */ /* set mode */
hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, hisi_pmic_rmw(pmic, rdev->desc->enable_reg,
sreg->register_info.eco_mode_mask, sreg->eco_mode_mask,
eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)); eco_mode << (ffs(sreg->eco_mode_mask) - 1));
pr_debug("<[%s]: ctrl_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", pr_debug("<[%s]: enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n",
__func__, __func__,
sreg->register_info.ctrl_reg, rdev->desc->enable_reg,
sreg->register_info.eco_mode_mask, sreg->eco_mode_mask,
eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)); eco_mode << (ffs(sreg->eco_mode_mask) - 1));
return 0; return 0;
} }
static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev, static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *rdev,
int input_uV, int output_uV, int input_uV, int output_uV,
int load_uA) int load_uA)
{ {
struct hisi_regulator *sreg = rdev_get_drvdata(dev); struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev);
if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) if (load_uA || ((unsigned int)load_uA > sreg->eco_uA))
return REGULATOR_MODE_NORMAL; return REGULATOR_MODE_NORMAL;
...@@ -228,42 +218,43 @@ static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev, ...@@ -228,42 +218,43 @@ static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev,
return REGULATOR_MODE_IDLE; return REGULATOR_MODE_IDLE;
} }
static int hisi_dt_parse_common(struct hisi_regulator *sreg, static int hisi_dt_parse(struct platform_device *pdev,
struct platform_device *pdev) struct hi6421v600_regulator *sreg,
struct regulator_desc *rdesc)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct regulator_desc *rdesc = &sreg->rdesc;
unsigned int register_info[3] = {0}; unsigned int register_info[3] = {0};
int ret = 0; unsigned int *v_table;
int ret;
/* parse .register_info.ctrl_reg */ /* parse .register_info.enable_reg */
ret = of_property_read_u32_array(np, "hisilicon,hisi-ctrl", ret = of_property_read_u32_array(np, "hisilicon,hisi-ctrl",
register_info, 3); register_info, 3);
if (ret) { if (ret) {
dev_err(dev, "no hisilicon,hisi-ctrl property set\n"); dev_err(dev, "no hisilicon,hisi-ctrl property set\n");
goto dt_parse_common_end; return ret;
} }
sreg->register_info.ctrl_reg = register_info[0]; rdesc->enable_reg = register_info[0];
sreg->register_info.enable_mask = register_info[1]; rdesc->enable_mask = register_info[1];
sreg->register_info.eco_mode_mask = register_info[2]; sreg->eco_mode_mask = register_info[2];
/* parse .register_info.vset_reg */ /* parse .register_info.vsel_reg */
ret = of_property_read_u32_array(np, "hisilicon,hisi-vset", ret = of_property_read_u32_array(np, "hisilicon,hisi-vset",
register_info, 2); register_info, 2);
if (ret) { if (ret) {
dev_err(dev, "no hisilicon,hisi-vset property set\n"); dev_err(dev, "no hisilicon,hisi-vset property set\n");
goto dt_parse_common_end; return ret;
} }
sreg->register_info.vset_reg = register_info[0]; rdesc->vsel_reg = register_info[0];
sreg->register_info.vset_mask = register_info[1]; rdesc->vsel_mask = register_info[1];
/* parse .off-on-delay */ /* parse .off-on-delay */
ret = of_property_read_u32(np, "hisilicon,hisi-off-on-delay-us", ret = of_property_read_u32(np, "hisilicon,hisi-off-on-delay-us",
&sreg->off_on_delay); &rdesc->off_on_delay);
if (ret) { if (ret) {
dev_err(dev, "no hisilicon,hisi-off-on-delay-us property set\n"); dev_err(dev, "no hisilicon,hisi-off-on-delay-us property set\n");
goto dt_parse_common_end; return ret;
} }
/* parse .enable_time */ /* parse .enable_time */
...@@ -271,7 +262,7 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, ...@@ -271,7 +262,7 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg,
&rdesc->enable_time); &rdesc->enable_time);
if (ret) { if (ret) {
dev_err(dev, "no hisilicon,hisi-enable-time-us property set\n"); dev_err(dev, "no hisilicon,hisi-enable-time-us property set\n");
goto dt_parse_common_end; return ret;
} }
/* parse .eco_uA */ /* parse .eco_uA */
...@@ -282,56 +273,24 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, ...@@ -282,56 +273,24 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg,
ret = 0; ret = 0;
} }
dt_parse_common_end: /* parse volt_table */
return ret;
}
static int hisi_dt_parse_ldo(struct hisi_regulator *sreg,
struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
struct regulator_desc *rdesc = &sreg->rdesc;
unsigned int *v_table;
int ret = 0;
/* parse .n_voltages, and .volt_table */ rdesc->n_voltages = of_property_count_u32_elems(np, "hisilicon,hisi-vset-table");
ret = of_property_read_u32(np, "hisilicon,hisi-n-voltages",
&rdesc->n_voltages);
if (ret) {
dev_err(dev, "no hisilicon,hisi-n-voltages property set\n");
goto dt_parse_ldo_end;
}
/* alloc space for .volt_table */
v_table = devm_kzalloc(dev, sizeof(unsigned int) * rdesc->n_voltages, v_table = devm_kzalloc(dev, sizeof(unsigned int) * rdesc->n_voltages,
GFP_KERNEL); GFP_KERNEL);
if (unlikely(!v_table)) { if (unlikely(!v_table))
ret = -ENOMEM; return -ENOMEM;
dev_err(dev, "no memory for .volt_table\n"); rdesc->volt_table = v_table;
goto dt_parse_ldo_end;
}
ret = of_property_read_u32_array(np, "hisilicon,hisi-vset-table", ret = of_property_read_u32_array(np, "hisilicon,hisi-vset-table",
v_table, rdesc->n_voltages); v_table, rdesc->n_voltages);
if (ret) { if (ret) {
dev_err(dev, "no hisilicon,hisi-vset-table property set\n"); dev_err(dev, "no hisilicon,hisi-vset-table property set\n");
goto dt_parse_ldo_end1; return ret;
}
rdesc->volt_table = v_table;
/* parse hisi regulator's dt common part */
ret = hisi_dt_parse_common(sreg, pdev);
if (ret) {
dev_err(dev, "failure in hisi_dt_parse_common\n");
goto dt_parse_ldo_end1;
} }
return ret; return 0;
dt_parse_ldo_end1:
dt_parse_ldo_end:
return ret;
} }
static struct regulator_ops hisi_ldo_rops = { static struct regulator_ops hisi_ldo_rops = {
...@@ -364,7 +323,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, ...@@ -364,7 +323,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev,
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct regulator_desc *rdesc; struct regulator_desc *rdesc;
struct regulator_dev *rdev; struct regulator_dev *rdev;
struct hisi_regulator *sreg = NULL; struct hi6421v600_regulator *sreg = NULL;
struct regulator_init_data *initdata; struct regulator_init_data *initdata;
struct regulator_config config = { }; struct regulator_config config = { };
struct regulation_constraints *constraint; struct regulation_constraints *constraint;
...@@ -401,11 +360,10 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, ...@@ -401,11 +360,10 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev,
if (!sreg) if (!sreg)
return -ENOMEM; return -ENOMEM;
sreg->name = initdata->constraints.name;
sreg->pmic = pmic; sreg->pmic = pmic;
rdesc = &sreg->rdesc; rdesc = &sreg->rdesc;
rdesc->name = sreg->name; rdesc->name = initdata->constraints.name;
rdesc->ops = &hisi_ldo_rops; rdesc->ops = &hisi_ldo_rops;
rdesc->type = REGULATOR_VOLTAGE; rdesc->type = REGULATOR_VOLTAGE;
rdesc->min_uV = initdata->constraints.min_uV; rdesc->min_uV = initdata->constraints.min_uV;
...@@ -415,7 +373,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, ...@@ -415,7 +373,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev,
initdata->supply_regulator = supplyname; initdata->supply_regulator = supplyname;
/* parse device tree data for regulator specific */ /* parse device tree data for regulator specific */
ret = hisi_dt_parse_ldo(sreg, pdev); ret = hisi_dt_parse(pdev, sreg, rdesc);
if (ret) { if (ret) {
dev_err(dev, "device tree parameter parse error!\n"); dev_err(dev, "device tree parameter parse error!\n");
goto hisi_probe_end; goto hisi_probe_end;
...@@ -501,13 +459,13 @@ static int hisi_regulator_probe(struct platform_device *pdev) ...@@ -501,13 +459,13 @@ static int hisi_regulator_probe(struct platform_device *pdev)
static int hisi_regulator_remove(struct platform_device *pdev) static int hisi_regulator_remove(struct platform_device *pdev)
{ {
struct regulator_dev *rdev = dev_get_drvdata(&pdev->dev); struct regulator_dev *rdev = dev_get_drvdata(&pdev->dev);
struct hisi_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev);
regulator_unregister(rdev); regulator_unregister(rdev);
/* TODO: should i worry about that? devm_kzalloc */ /* TODO: should i worry about that? devm_kzalloc */
if (sreg->rdesc.volt_table) if (rdev->desc->volt_table)
devm_kfree(&pdev->dev, (unsigned int *)sreg->rdesc.volt_table); devm_kfree(&pdev->dev, (unsigned int *)rdev->desc->volt_table);
kfree(sreg); kfree(sreg);
......
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