regulator: wm8994: Allow registration with no platform data

[cascardo/linux.git] / drivers / regulator / wm8994-regulator.c

diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index f4a6294..9a99431 100644 (file)
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -86,36 +86,6 @@ static int wm8994_ldo1_list_voltage(struct regulator_dev *rdev,
        return (selector * 100000) + 2400000;
 }
 
-static int wm8994_ldo1_get_voltage_sel(struct regulator_dev *rdev)
-{
-       struct wm8994_ldo *ldo = rdev_get_drvdata(rdev);
-       int val;
-
-       val = wm8994_reg_read(ldo->wm8994, WM8994_LDO_1);
-       if (val < 0)
-               return val;
-
-       return (val & WM8994_LDO1_VSEL_MASK) >> WM8994_LDO1_VSEL_SHIFT;
-}
-
-static int wm8994_ldo1_set_voltage(struct regulator_dev *rdev,
-                                  int min_uV, int max_uV, unsigned *s)
-{
-       struct wm8994_ldo *ldo = rdev_get_drvdata(rdev);
-       int selector, v;
-
-       selector = (min_uV - 2400000) / 100000;
-       v = wm8994_ldo1_list_voltage(rdev, selector);
-       if (v < 0 || v > max_uV)
-               return -EINVAL;
-
-       *s = selector;
-       selector <<= WM8994_LDO1_VSEL_SHIFT;
-
-       return wm8994_set_bits(ldo->wm8994, WM8994_LDO_1,
-                              WM8994_LDO1_VSEL_MASK, selector);
-}
-
 static struct regulator_ops wm8994_ldo1_ops = {
        .enable = wm8994_ldo_enable,
        .disable = wm8994_ldo_disable,
@@ -123,8 +93,8 @@ static struct regulator_ops wm8994_ldo1_ops = {
        .enable_time = wm8994_ldo_enable_time,
 
        .list_voltage = wm8994_ldo1_list_voltage,
-       .get_voltage_sel = wm8994_ldo1_get_voltage_sel,
-       .set_voltage = wm8994_ldo1_set_voltage,
+       .get_voltage_sel = regulator_get_voltage_sel_regmap,
+       .set_voltage_sel = regulator_set_voltage_sel_regmap,
 };
 
 static int wm8994_ldo2_list_voltage(struct regulator_dev *rdev,
@@ -153,51 +123,6 @@ static int wm8994_ldo2_list_voltage(struct regulator_dev *rdev,
        }
 }
 
-static int wm8994_ldo2_get_voltage_sel(struct regulator_dev *rdev)
-{
-       struct wm8994_ldo *ldo = rdev_get_drvdata(rdev);
-       int val;
-
-       val = wm8994_reg_read(ldo->wm8994, WM8994_LDO_2);
-       if (val < 0)
-               return val;
-
-       return (val & WM8994_LDO2_VSEL_MASK) >> WM8994_LDO2_VSEL_SHIFT;
-}
-
-static int wm8994_ldo2_set_voltage(struct regulator_dev *rdev,
-                                  int min_uV, int max_uV, unsigned *s)
-{
-       struct wm8994_ldo *ldo = rdev_get_drvdata(rdev);
-       int selector, v;
-
-       switch (ldo->wm8994->type) {
-       case WM8994:
-               selector = (min_uV - 900000) / 100000;
-               break;
-       case WM8958:
-               selector = (min_uV - 1000000) / 100000;
-               break;
-       case WM1811:
-               selector = (min_uV - 950000) / 100000;
-               if (selector == 0)
-                       selector = 1;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       v = wm8994_ldo2_list_voltage(rdev, selector);
-       if (v < 0 || v > max_uV)
-               return -EINVAL;
-
-       *s = selector;
-       selector <<= WM8994_LDO2_VSEL_SHIFT;
-
-       return wm8994_set_bits(ldo->wm8994, WM8994_LDO_2,
-                              WM8994_LDO2_VSEL_MASK, selector);
-}
-
 static struct regulator_ops wm8994_ldo2_ops = {
        .enable = wm8994_ldo_enable,
        .disable = wm8994_ldo_disable,
@@ -205,8 +130,8 @@ static struct regulator_ops wm8994_ldo2_ops = {
        .enable_time = wm8994_ldo_enable_time,
 
        .list_voltage = wm8994_ldo2_list_voltage,
-       .get_voltage_sel = wm8994_ldo2_get_voltage_sel,
-       .set_voltage = wm8994_ldo2_set_voltage,
+       .get_voltage_sel = regulator_get_voltage_sel_regmap,
+       .set_voltage_sel = regulator_set_voltage_sel_regmap,
 };
 
 static const struct regulator_desc wm8994_ldo_desc[] = {
@@ -215,6 +140,8 @@ static const struct regulator_desc wm8994_ldo_desc[] = {
                .id = 1,
                .type = REGULATOR_VOLTAGE,
                .n_voltages = WM8994_LDO1_MAX_SELECTOR + 1,
+               .vsel_reg = WM8994_LDO_1,
+               .vsel_mask = WM8994_LDO1_VSEL_MASK,
                .ops = &wm8994_ldo1_ops,
                .owner = THIS_MODULE,
        },
@@ -223,6 +150,8 @@ static const struct regulator_desc wm8994_ldo_desc[] = {
                .id = 2,
                .type = REGULATOR_VOLTAGE,
                .n_voltages = WM8994_LDO2_MAX_SELECTOR + 1,
+               .vsel_reg = WM8994_LDO_2,
+               .vsel_mask = WM8994_LDO2_VSEL_MASK,
                .ops = &wm8994_ldo2_ops,
                .owner = THIS_MODULE,
        },
@@ -239,9 +168,6 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
-       if (!pdata)
-               return -ENODEV;
-
        ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm8994_ldo), GFP_KERNEL);
        if (ldo == NULL) {
                dev_err(&pdev->dev, "Unable to allocate private data\n");
@@ -253,25 +179,20 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev)
        if (pdata->ldo[id].enable && gpio_is_valid(pdata->ldo[id].enable)) {
                ldo->enable = pdata->ldo[id].enable;
 
-               ret = gpio_request(ldo->enable, "WM8994 LDO enable");
+               ret = gpio_request_one(ldo->enable, 0, "WM8994 LDO enable");
                if (ret < 0) {
                        dev_err(&pdev->dev, "Failed to get enable GPIO: %d\n",
                                ret);
                        goto err;
                }
-
-               ret = gpio_direction_output(ldo->enable, ldo->is_enabled);
-               if (ret < 0) {
-                       dev_err(&pdev->dev, "Failed to set GPIO up: %d\n",
-                               ret);
-                       goto err_gpio;
-               }
        } else
                ldo->is_enabled = true;
 
-       config.dev = &pdev->dev;
-       config.init_data = pdata->ldo[id].init_data;
+       config.dev = wm8994->dev;
        config.driver_data = ldo;
+       config.regmap = wm8994->regmap;
+       if (pdata)
+               config.init_data = pdata->ldo[id].init_data;
 
        ldo->regulator = regulator_register(&wm8994_ldo_desc[id], &config);
        if (IS_ERR(ldo->regulator)) {