regulator: rk808: Remove pdata from the regulator

Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Tested-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c
index e3720085b4ce509c516a385f4cfc38ce32a9f2e4..d91f2b658080d99b2520566b63878d5568906156 100644 (file)
--- a/drivers/regulator/rk808-regulator.c
+++ b/drivers/regulator/rk808-regulator.c
@@ -14,24 +14,16 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
- *
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/i2c.h>
-#include <linux/err.h>
-#include <linux/platform_device.h>
 #include <linux/mfd/rk808.h>
-#include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/of_regulator.h>
-#include <linux/regmap.h>
-#include <linux/slab.h>
-/*
- * Field Definitions.
- */
+
+/* Field Definitions */
 #define RK808_BUCK_VSEL_MASK   0x3f
 #define RK808_BUCK4_VSEL_MASK  0xf
 #define RK808_LDO_VSEL_MASK    0x1f
@@ -50,10 +42,6 @@ static const int buck_contr_base_addr[] = {
        RK808_BUCK4_CONFIG_REG,
 };
 
-#define rk808_BUCK_SET_VOL_REG(x) (buck_set_vol_base_addr[x])
-#define rk808_BUCK_CONTR_REG(x) (buck_contr_base_addr[x])
-#define rk808_LDO_SET_VOL_REG(x) (ldo_set_vol_base_addr[x])
-
 static const int ldo_set_vol_base_addr[] = {
        RK808_LDO1_ON_VSEL_REG,
        RK808_LDO2_ON_VSEL_REG,
@@ -65,9 +53,7 @@ static const int ldo_set_vol_base_addr[] = {
        RK808_LDO8_ON_VSEL_REG,
 };
 
-/*
- * rk808 voltage number
- */
+/* rk808 voltage number */
 static const struct regulator_linear_range rk808_buck_voltage_ranges[] = {
        REGULATOR_LINEAR_RANGE(700000, 0, 63, 12500),
 };
@@ -308,77 +294,35 @@ static struct of_regulator_match rk808_reg_matches[] = {
        [RK808_ID_SWITCH2]      = { .name = "SWITCH_REG2" },
 };
 
-static int rk808_regulator_dts(struct i2c_client *client,
-                              struct rk808_board *pdata)
-{
-       struct device_node *np, *reg_np;
-       int i, ret;
-
-       np = client->dev.of_node;
-       if (!np) {
-               dev_err(&client->dev, "could not find pmic sub-node\n");
-               return -ENXIO;
-       }
-
-       reg_np = of_get_child_by_name(np, "regulators");
-       if (!reg_np)
-               return -ENXIO;
-
-       ret = of_regulator_match(&client->dev, reg_np, rk808_reg_matches,
-                                RK808_NUM_REGULATORS);
-       if (ret < 0) {
-               dev_err(&client->dev,
-                       "failed to parse regulator data: %d\n", ret);
-               return ret;
-       }
-
-       for (i = 0; i < RK808_NUM_REGULATORS; i++) {
-               if (!rk808_reg_matches[i].init_data ||
-                   !rk808_reg_matches[i].of_node)
-                       continue;
-
-               pdata->rk808_init_data[i] = rk808_reg_matches[i].init_data;
-               pdata->of_node[i] = rk808_reg_matches[i].of_node;
-       }
-
-       return 0;
-}
-
 static int rk808_regulator_probe(struct platform_device *pdev)
 {
        struct rk808 *rk808 = dev_get_drvdata(pdev->dev.parent);
        struct i2c_client *client = rk808->i2c;
-       struct rk808_board *pdata = dev_get_platdata(&client->dev);
+       struct device_node *reg_np;
        struct regulator_config config = {};
        struct regulator_dev *rk808_rdev;
-       struct regulator_init_data *reg_data;
-       int i = 0;
-       int ret = 0;
+       int ret, i;
 
-       if (!pdata) {
-               pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
-               if (!pdata)
-                       return -ENOMEM;
-       }
+       reg_np = of_get_child_by_name(client->dev.of_node, "regulators");
+       if (!reg_np)
+               return -ENXIO;
 
-       ret = rk808_regulator_dts(client, pdata);
-       if (ret)
+       ret = of_regulator_match(&client->dev, reg_np, rk808_reg_matches,
+                                RK808_NUM_REGULATORS);
+       if (ret < 0)
                return ret;
 
        /* Instantiate the regulators */
        for (i = 0; i < RK808_NUM_REGULATORS; i++) {
-               reg_data = pdata->rk808_init_data[i];
-               if (!reg_data)
+               if (!rk808_reg_matches[i].init_data ||
+                   !rk808_reg_matches[i].of_node)
                        continue;
 
                config.dev = &client->dev;
                config.driver_data = rk808;
                config.regmap = rk808->regmap;
-
-               if (client->dev.of_node)
-                       config.of_node = pdata->of_node[i];
-
-               config.init_data = reg_data;
+               config.of_node = rk808_reg_matches[i].of_node;
+               config.init_data = rk808_reg_matches[i].init_data;
 
                rk808_rdev = devm_regulator_register(&pdev->dev,
                                                     &rk808_reg[i], &config);
@@ -388,6 +332,7 @@ static int rk808_regulator_probe(struct platform_device *pdev)
                        return PTR_ERR(rk808_rdev);
                }
        }
+
        return 0;
 }
 
@@ -403,6 +348,6 @@ module_platform_driver(rk808_regulator_driver);
 
 MODULE_DESCRIPTION("regulator driver for the rk808 series PMICs");
 MODULE_AUTHOR("Chris Zhong<zyw@rock-chips.com>");
-MODULE_AUTHOR("Zhang Qing<zhanqging@rock-chips.com>");
+MODULE_AUTHOR("Zhang Qing<zhangqing@rock-chips.com>");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:rk808-regulator");