staging: regulator: hi6421v600-regulator: use shorter names for OF properties

Simplify the names of the OF properties, in order to make
them similar to other drivers and to make easier to understand
what each property means.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/98f66100263940901ba59ec187919e9cf5e64f31.1597647359.git.mchehab+huawei@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c
index 2d1096e..e4a6489 100644 (file)
--- a/drivers/staging/hikey9xx/hi6421v600-regulator.c
+++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c
@@ -196,14 +196,14 @@ static int hisi_regulator_set_mode(struct regulator_dev *rdev,
 {
        struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev);
        struct hisi_pmic *pmic = sreg->pmic;
-       u32 eco_mode;
+       u32 val;
 
        switch (mode) {
        case REGULATOR_MODE_NORMAL:
-               eco_mode = HISI_ECO_MODE_DISABLE;
+               val = 0;
                break;
        case REGULATOR_MODE_IDLE:
-               eco_mode = HISI_ECO_MODE_ENABLE;
+               val = sreg->eco_mode_mask << (ffs(sreg->eco_mode_mask) - 1);
                break;
        default:
                return -EINVAL;
@@ -211,15 +211,12 @@ static int hisi_regulator_set_mode(struct regulator_dev *rdev,
 
        /* set mode */
        hisi_pmic_rmw(pmic, rdev->desc->enable_reg,
-                     sreg->eco_mode_mask,
-               eco_mode << (ffs(sreg->eco_mode_mask) - 1));
+                     sreg->eco_mode_mask, val);
 
        dev_dbg(&rdev->dev,
                "%s: enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x\n",
-                __func__,
-               rdev->desc->enable_reg,
-               sreg->eco_mode_mask,
-               eco_mode << (ffs(sreg->eco_mode_mask) - 1));
+                __func__, rdev->desc->enable_reg, sreg->eco_mode_mask, val);
+
        return 0;
 }
 
@@ -249,10 +246,10 @@ static int hisi_dt_parse(struct platform_device *pdev,
        int ret;
 
        /* parse .register_info.enable_reg */
-       ret = of_property_read_u32_array(np, "hisilicon,hisi-ctrl",
+       ret = of_property_read_u32_array(np, "hi6421-ctrl",
                                         register_info, 3);
        if (ret) {
-               dev_err(dev, "no hisilicon,hisi-ctrl property set\n");
+               dev_err(dev, "no hi6421-ctrl property set\n");
                return ret;
        }
        rdesc->enable_reg = register_info[0];
@@ -260,33 +257,33 @@ static int hisi_dt_parse(struct platform_device *pdev,
        sreg->eco_mode_mask = register_info[2];
 
        /* parse .register_info.vsel_reg */
-       ret = of_property_read_u32_array(np, "hisilicon,hisi-vset",
+       ret = of_property_read_u32_array(np, "hi6421-vsel",
                                         register_info, 2);
        if (ret) {
-               dev_err(dev, "no hisilicon,hisi-vset property set\n");
+               dev_err(dev, "no hi6421-vsel property set\n");
                return ret;
        }
        rdesc->vsel_reg = register_info[0];
        rdesc->vsel_mask = register_info[1];
 
        /* parse .off-on-delay */
-       ret = of_property_read_u32(np, "hisilicon,hisi-off-on-delay-us",
+       ret = of_property_read_u32(np, "off-on-delay-us",
                                   &rdesc->off_on_delay);
        if (ret) {
-               dev_err(dev, "no hisilicon,hisi-off-on-delay-us property set\n");
+               dev_err(dev, "no off-on-delay-us property set\n");
                return ret;
        }
 
        /* parse .enable_time */
-       ret = of_property_read_u32(np, "hisilicon,hisi-enable-time-us",
+       ret = of_property_read_u32(np, "startup-delay-us",
                                   &rdesc->enable_time);
        if (ret) {
-               dev_err(dev, "no hisilicon,hisi-enable-time-us property set\n");
+               dev_err(dev, "no startup-delay-us property set\n");
                return ret;
        }
 
        /* parse .eco_uA */
-       ret = of_property_read_u32(np, "hisilicon,hisi-eco-microamp",
+       ret = of_property_read_u32(np, "eco-microamp",
                                   &sreg->eco_uA);
        if (ret) {
                sreg->eco_uA = 0;
@@ -295,7 +292,7 @@ static int hisi_dt_parse(struct platform_device *pdev,
 
        /* parse volt_table */
 
-       rdesc->n_voltages = of_property_count_u32_elems(np, "hisilicon,hisi-vset-table");
+       rdesc->n_voltages = of_property_count_u32_elems(np, "voltage-table");
 
        v_table = devm_kzalloc(dev, sizeof(unsigned int) * rdesc->n_voltages,
                               GFP_KERNEL);
@@ -303,10 +300,10 @@ static int hisi_dt_parse(struct platform_device *pdev,
                return  -ENOMEM;
        rdesc->volt_table = v_table;
 
-       ret = of_property_read_u32_array(np, "hisilicon,hisi-vset-table",
+       ret = of_property_read_u32_array(np, "voltage-table",
                                         v_table, rdesc->n_voltages);
        if (ret) {
-               dev_err(dev, "no hisilicon,hisi-vset-table property set\n");
+               dev_err(dev, "no voltage-table property set\n");
                return ret;
        }
 
@@ -329,13 +326,6 @@ static struct regulator_ops hisi_ldo_rops = {
  * Used only for parsing the DT properties
  */
 
-static const struct of_device_id of_hisi_pmic_match_tbl[] = {
-       {
-               .compatible = "hisilicon,hi6421-spmi-pmic-ldo",
-       },
-       { }
-};
-
 static int hisi_regulator_probe_ldo(struct platform_device *pdev,
                                    struct device_node *np,
                                    struct hisi_pmic *pmic)
@@ -360,14 +350,14 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev,
        /* hisi regulator supports two modes */
        constraint = &initdata->constraints;
 
-       ret = of_property_read_u32_array(np, "hisilicon,valid-modes-mask",
+       ret = of_property_read_u32_array(np, "valid-modes-mask",
                                         &constraint->valid_modes_mask, 1);
        if (ret) {
                dev_err(dev, "no valid modes mask\n");
                ret = -ENODEV;
                return ret;
        }
-       ret = of_property_read_u32_array(np, "hisilicon,valid-idle-mask",
+       ret = of_property_read_u32_array(np, "valid-idle-mask",
                                         &temp_modes, 1);
        if (ret) {
                dev_err(dev, "no valid idle mask\n");
@@ -388,7 +378,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev,
        rdesc->type = REGULATOR_VOLTAGE;
        rdesc->min_uV = initdata->constraints.min_uV;
 
-       supplyname = of_get_property(np, "hisilicon,supply_name", NULL);
+       supplyname = of_get_property(np, "supply_name", NULL);
        if (supplyname)
                initdata->supply_regulator = supplyname;