Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next

[karo-tx-linux.git] / drivers / regulator / wm831x-ldo.c

diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index 344beb8413a3eca5346bd393d33e01de812a9eed..9fe71dc20c3fe2b2d56ef8a494fccd780b55049e 100644 (file)
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -47,41 +47,6 @@ struct wm831x_ldo {
  * Shared
  */
 
-static int wm831x_ldo_is_enabled(struct regulator_dev *rdev)
-{
-       struct wm831x_ldo *ldo = rdev_get_drvdata(rdev);
-       struct wm831x *wm831x = ldo->wm831x;
-       int mask = 1 << rdev_get_id(rdev);
-       int reg;
-
-       reg = wm831x_reg_read(wm831x, WM831X_LDO_ENABLE);
-       if (reg < 0)
-               return reg;
-
-       if (reg & mask)
-               return 1;
-       else
-               return 0;
-}
-
-static int wm831x_ldo_enable(struct regulator_dev *rdev)
-{
-       struct wm831x_ldo *ldo = rdev_get_drvdata(rdev);
-       struct wm831x *wm831x = ldo->wm831x;
-       int mask = 1 << rdev_get_id(rdev);
-
-       return wm831x_set_bits(wm831x, WM831X_LDO_ENABLE, mask, mask);
-}
-
-static int wm831x_ldo_disable(struct regulator_dev *rdev)
-{
-       struct wm831x_ldo *ldo = rdev_get_drvdata(rdev);
-       struct wm831x *wm831x = ldo->wm831x;
-       int mask = 1 << rdev_get_id(rdev);
-
-       return wm831x_set_bits(wm831x, WM831X_LDO_ENABLE, mask, 0);
-}
-
 static irqreturn_t wm831x_ldo_uv_irq(int irq, void *data)
 {
        struct wm831x_ldo *ldo = data;
@@ -161,22 +126,6 @@ static int wm831x_gp_ldo_set_suspend_voltage(struct regulator_dev *rdev,
        return wm831x_gp_ldo_set_voltage_int(rdev, reg, uV, uV, &selector);
 }
 
-static int wm831x_gp_ldo_get_voltage_sel(struct regulator_dev *rdev)
-{
-       struct wm831x_ldo *ldo = rdev_get_drvdata(rdev);
-       struct wm831x *wm831x = ldo->wm831x;
-       int reg = ldo->base + WM831X_LDO_ON_CONTROL;
-       int ret;
-
-       ret = wm831x_reg_read(wm831x, reg);
-       if (ret < 0)
-               return ret;
-
-       ret &= WM831X_LDO1_ON_VSEL_MASK;
-
-       return ret;
-}
-
 static unsigned int wm831x_gp_ldo_get_mode(struct regulator_dev *rdev)
 {
        struct wm831x_ldo *ldo = rdev_get_drvdata(rdev);
@@ -294,7 +243,7 @@ static unsigned int wm831x_gp_ldo_get_optimum_mode(struct regulator_dev *rdev,
 
 static struct regulator_ops wm831x_gp_ldo_ops = {
        .list_voltage = wm831x_gp_ldo_list_voltage,
-       .get_voltage_sel = wm831x_gp_ldo_get_voltage_sel,
+       .get_voltage_sel = regulator_get_voltage_sel_regmap,
        .set_voltage = wm831x_gp_ldo_set_voltage,
        .set_suspend_voltage = wm831x_gp_ldo_set_suspend_voltage,
        .get_mode = wm831x_gp_ldo_get_mode,
@@ -302,9 +251,9 @@ static struct regulator_ops wm831x_gp_ldo_ops = {
        .get_status = wm831x_gp_ldo_get_status,
        .get_optimum_mode = wm831x_gp_ldo_get_optimum_mode,
 
-       .is_enabled = wm831x_ldo_is_enabled,
-       .enable = wm831x_ldo_enable,
-       .disable = wm831x_ldo_disable,
+       .is_enabled = regulator_is_enabled_regmap,
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
 };
 
 static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev)
@@ -325,9 +274,6 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
-       if (pdata == NULL || pdata->ldo[id] == NULL)
-               return -ENODEV;
-
        ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL);
        if (ldo == NULL) {
                dev_err(&pdev->dev, "Unable to allocate private data\n");
@@ -356,10 +302,16 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev)
        ldo->desc.n_voltages = WM831X_GP_LDO_MAX_SELECTOR + 1;
        ldo->desc.ops = &wm831x_gp_ldo_ops;
        ldo->desc.owner = THIS_MODULE;
+       ldo->desc.vsel_reg = ldo->base + WM831X_LDO_ON_CONTROL;
+       ldo->desc.vsel_mask = WM831X_LDO1_ON_VSEL_MASK;
+       ldo->desc.enable_reg = WM831X_LDO_ENABLE;
+       ldo->desc.enable_mask = 1 << id;
 
        config.dev = pdev->dev.parent;
-       config.init_data = pdata->ldo[id];
+       if (pdata)
+               config.init_data = pdata->ldo[id];
        config.driver_data = ldo;
+       config.regmap = wm831x->regmap;
 
        ldo->regulator = regulator_register(&ldo->desc, &config);
        if (IS_ERR(ldo->regulator)) {
@@ -478,22 +430,6 @@ static int wm831x_aldo_set_suspend_voltage(struct regulator_dev *rdev,
        return wm831x_aldo_set_voltage_int(rdev, reg, uV, uV, &selector);
 }
 
-static int wm831x_aldo_get_voltage_sel(struct regulator_dev *rdev)
-{
-       struct wm831x_ldo *ldo = rdev_get_drvdata(rdev);
-       struct wm831x *wm831x = ldo->wm831x;
-       int reg = ldo->base + WM831X_LDO_ON_CONTROL;
-       int ret;
-
-       ret = wm831x_reg_read(wm831x, reg);
-       if (ret < 0)
-               return ret;
-
-       ret &= WM831X_LDO7_ON_VSEL_MASK;
-
-       return ret;
-}
-
 static unsigned int wm831x_aldo_get_mode(struct regulator_dev *rdev)
 {
        struct wm831x_ldo *ldo = rdev_get_drvdata(rdev);
@@ -569,16 +505,16 @@ static int wm831x_aldo_get_status(struct regulator_dev *rdev)
 
 static struct regulator_ops wm831x_aldo_ops = {
        .list_voltage = wm831x_aldo_list_voltage,
-       .get_voltage_sel = wm831x_aldo_get_voltage_sel,
+       .get_voltage_sel = regulator_get_voltage_sel_regmap,
        .set_voltage = wm831x_aldo_set_voltage,
        .set_suspend_voltage = wm831x_aldo_set_suspend_voltage,
        .get_mode = wm831x_aldo_get_mode,
        .set_mode = wm831x_aldo_set_mode,
        .get_status = wm831x_aldo_get_status,
 
-       .is_enabled = wm831x_ldo_is_enabled,
-       .enable = wm831x_ldo_enable,
-       .disable = wm831x_ldo_disable,
+       .is_enabled = regulator_is_enabled_regmap,
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
 };
 
 static __devinit int wm831x_aldo_probe(struct platform_device *pdev)
@@ -599,9 +535,6 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
-       if (pdata == NULL || pdata->ldo[id] == NULL)
-               return -ENODEV;
-
        ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL);
        if (ldo == NULL) {
                dev_err(&pdev->dev, "Unable to allocate private data\n");
@@ -630,10 +563,16 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev)
        ldo->desc.n_voltages = WM831X_ALDO_MAX_SELECTOR + 1;
        ldo->desc.ops = &wm831x_aldo_ops;
        ldo->desc.owner = THIS_MODULE;
+       ldo->desc.vsel_reg = ldo->base + WM831X_LDO_ON_CONTROL;
+       ldo->desc.vsel_mask = WM831X_LDO7_ON_VSEL_MASK;
+       ldo->desc.enable_reg = WM831X_LDO_ENABLE;
+       ldo->desc.enable_mask = 1 << id;
 
        config.dev = pdev->dev.parent;
-       config.init_data = pdata->ldo[id];
+       if (pdata)
+               config.init_data = pdata->ldo[id];
        config.driver_data = ldo;
+       config.regmap = wm831x->regmap;
 
        ldo->regulator = regulator_register(&ldo->desc, &config);
        if (IS_ERR(ldo->regulator)) {
@@ -739,22 +678,6 @@ static int wm831x_alive_ldo_set_suspend_voltage(struct regulator_dev *rdev,
        return wm831x_alive_ldo_set_voltage_int(rdev, reg, uV, uV, &selector);
 }
 
-static int wm831x_alive_ldo_get_voltage_sel(struct regulator_dev *rdev)
-{
-       struct wm831x_ldo *ldo = rdev_get_drvdata(rdev);
-       struct wm831x *wm831x = ldo->wm831x;
-       int reg = ldo->base + WM831X_ALIVE_LDO_ON_CONTROL;
-       int ret;
-
-       ret = wm831x_reg_read(wm831x, reg);
-       if (ret < 0)
-               return ret;
-
-       ret &= WM831X_LDO11_ON_VSEL_MASK;
-
-       return ret;
-}
-
 static int wm831x_alive_ldo_get_status(struct regulator_dev *rdev)
 {
        struct wm831x_ldo *ldo = rdev_get_drvdata(rdev);
@@ -774,14 +697,14 @@ static int wm831x_alive_ldo_get_status(struct regulator_dev *rdev)
 
 static struct regulator_ops wm831x_alive_ldo_ops = {
        .list_voltage = wm831x_alive_ldo_list_voltage,
-       .get_voltage_sel = wm831x_alive_ldo_get_voltage_sel,
+       .get_voltage_sel = regulator_get_voltage_sel_regmap,
        .set_voltage = wm831x_alive_ldo_set_voltage,
        .set_suspend_voltage = wm831x_alive_ldo_set_suspend_voltage,
        .get_status = wm831x_alive_ldo_get_status,
 
-       .is_enabled = wm831x_ldo_is_enabled,
-       .enable = wm831x_ldo_enable,
-       .disable = wm831x_ldo_disable,
+       .is_enabled = regulator_is_enabled_regmap,
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
 };
 
 static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)
@@ -803,9 +726,6 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
-       if (pdata == NULL || pdata->ldo[id] == NULL)
-               return -ENODEV;
-
        ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL);
        if (ldo == NULL) {
                dev_err(&pdev->dev, "Unable to allocate private data\n");
@@ -834,10 +754,16 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)
        ldo->desc.n_voltages = WM831X_ALIVE_LDO_MAX_SELECTOR + 1;
        ldo->desc.ops = &wm831x_alive_ldo_ops;
        ldo->desc.owner = THIS_MODULE;
+       ldo->desc.vsel_reg = ldo->base + WM831X_ALIVE_LDO_ON_CONTROL;
+       ldo->desc.vsel_mask = WM831X_LDO11_ON_VSEL_MASK;
+       ldo->desc.enable_reg = WM831X_LDO_ENABLE;
+       ldo->desc.enable_mask = 1 << id;
 
        config.dev = pdev->dev.parent;
-       config.init_data = pdata->ldo[id];
+       if (pdata)
+               config.init_data = pdata->ldo[id];
        config.driver_data = ldo;
+       config.regmap = wm831x->regmap;
 
        ldo->regulator = regulator_register(&ldo->desc, &config);
        if (IS_ERR(ldo->regulator)) {