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

[cascardo/linux.git] / drivers / regulator / wm831x-dcdc.c

diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index a2acafd..8710cfb 100644 (file)
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -61,41 +61,6 @@ struct wm831x_dcdc {
        int dvs_vsel;
 };
 
-static int wm831x_dcdc_is_enabled(struct regulator_dev *rdev)
-{
-       struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
-       struct wm831x *wm831x = dcdc->wm831x;
-       int mask = 1 << rdev_get_id(rdev);
-       int reg;
-
-       reg = wm831x_reg_read(wm831x, WM831X_DCDC_ENABLE);
-       if (reg < 0)
-               return reg;
-
-       if (reg & mask)
-               return 1;
-       else
-               return 0;
-}
-
-static int wm831x_dcdc_enable(struct regulator_dev *rdev)
-{
-       struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
-       struct wm831x *wm831x = dcdc->wm831x;
-       int mask = 1 << rdev_get_id(rdev);
-
-       return wm831x_set_bits(wm831x, WM831X_DCDC_ENABLE, mask, mask);
-}
-
-static int wm831x_dcdc_disable(struct regulator_dev *rdev)
-{
-       struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
-       struct wm831x *wm831x = dcdc->wm831x;
-       int mask = 1 << rdev_get_id(rdev);
-
-       return wm831x_set_bits(wm831x, WM831X_DCDC_ENABLE, mask, 0);
-}
-
 static unsigned int wm831x_dcdc_get_mode(struct regulator_dev *rdev)
 
 {
@@ -415,9 +380,9 @@ static struct regulator_ops wm831x_buckv_ops = {
        .set_current_limit = wm831x_buckv_set_current_limit,
        .get_current_limit = wm831x_buckv_get_current_limit,
 
-       .is_enabled = wm831x_dcdc_is_enabled,
-       .enable = wm831x_dcdc_enable,
-       .disable = wm831x_dcdc_disable,
+       .is_enabled = regulator_is_enabled_regmap,
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
        .get_status = wm831x_dcdc_get_status,
        .get_mode = wm831x_dcdc_get_mode,
        .set_mode = wm831x_dcdc_set_mode,
@@ -507,9 +472,6 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "Probing DCDC%d\n", id + 1);
 
-       if (pdata == NULL || pdata->dcdc[id] == NULL)
-               return -ENODEV;
-
        dcdc = devm_kzalloc(&pdev->dev,  sizeof(struct wm831x_dcdc),
                            GFP_KERNEL);
        if (dcdc == NULL) {
@@ -539,6 +501,8 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
        dcdc->desc.n_voltages = WM831X_BUCKV_MAX_SELECTOR + 1;
        dcdc->desc.ops = &wm831x_buckv_ops;
        dcdc->desc.owner = THIS_MODULE;
+       dcdc->desc.enable_reg = WM831X_DCDC_ENABLE;
+       dcdc->desc.enable_mask = 1 << id;
 
        ret = wm831x_reg_read(wm831x, dcdc->base + WM831X_DCDC_ON_CONFIG);
        if (ret < 0) {
@@ -558,8 +522,10 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
                wm831x_buckv_dvs_init(dcdc, pdata->dcdc[id]->driver_data);
 
        config.dev = pdev->dev.parent;
-       config.init_data = pdata->dcdc[id];
+       if (pdata)
+               config.init_data = pdata->dcdc[id];
        config.driver_data = dcdc;
+       config.regmap = wm831x->regmap;
 
        dcdc->regulator = regulator_register(&dcdc->desc, &config);
        if (IS_ERR(dcdc->regulator)) {
@@ -679,29 +645,15 @@ static int wm831x_buckp_set_suspend_voltage(struct regulator_dev *rdev,
        return wm831x_buckp_set_voltage_int(rdev, reg, uV, uV, &selector);
 }
 
-static int wm831x_buckp_get_voltage_sel(struct regulator_dev *rdev)
-{
-       struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
-       struct wm831x *wm831x = dcdc->wm831x;
-       u16 reg = dcdc->base + WM831X_DCDC_ON_CONFIG;
-       int val;
-
-       val = wm831x_reg_read(wm831x, reg);
-       if (val < 0)
-               return val;
-
-       return val & WM831X_DC3_ON_VSEL_MASK;
-}
-
 static struct regulator_ops wm831x_buckp_ops = {
        .set_voltage = wm831x_buckp_set_voltage,
-       .get_voltage_sel = wm831x_buckp_get_voltage_sel,
+       .get_voltage_sel = regulator_get_voltage_sel_regmap,
        .list_voltage = wm831x_buckp_list_voltage,
        .set_suspend_voltage = wm831x_buckp_set_suspend_voltage,
 
-       .is_enabled = wm831x_dcdc_is_enabled,
-       .enable = wm831x_dcdc_enable,
-       .disable = wm831x_dcdc_disable,
+       .is_enabled = regulator_is_enabled_regmap,
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
        .get_status = wm831x_dcdc_get_status,
        .get_mode = wm831x_dcdc_get_mode,
        .set_mode = wm831x_dcdc_set_mode,
@@ -726,9 +678,6 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "Probing DCDC%d\n", id + 1);
 
-       if (pdata == NULL || pdata->dcdc[id] == NULL)
-               return -ENODEV;
-
        dcdc = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_dcdc),
                            GFP_KERNEL);
        if (dcdc == NULL) {
@@ -758,10 +707,16 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)
        dcdc->desc.n_voltages = WM831X_BUCKP_MAX_SELECTOR + 1;
        dcdc->desc.ops = &wm831x_buckp_ops;
        dcdc->desc.owner = THIS_MODULE;
+       dcdc->desc.vsel_reg = dcdc->base + WM831X_DCDC_ON_CONFIG;
+       dcdc->desc.vsel_mask = WM831X_DC3_ON_VSEL_MASK;
+       dcdc->desc.enable_reg = WM831X_DCDC_ENABLE;
+       dcdc->desc.enable_mask = 1 << id;
 
        config.dev = pdev->dev.parent;
-       config.init_data = pdata->dcdc[id];
+       if (pdata)
+               config.init_data = pdata->dcdc[id];
        config.driver_data = dcdc;
+       config.regmap = wm831x->regmap;
 
        dcdc->regulator = regulator_register(&dcdc->desc, &config);
        if (IS_ERR(dcdc->regulator)) {
@@ -845,9 +800,9 @@ static int wm831x_boostp_get_status(struct regulator_dev *rdev)
 static struct regulator_ops wm831x_boostp_ops = {
        .get_status = wm831x_boostp_get_status,
 
-       .is_enabled = wm831x_dcdc_is_enabled,
-       .enable = wm831x_dcdc_enable,
-       .disable = wm831x_dcdc_disable,
+       .is_enabled = regulator_is_enabled_regmap,
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
 };
 
 static __devinit int wm831x_boostp_probe(struct platform_device *pdev)
@@ -887,10 +842,13 @@ static __devinit int wm831x_boostp_probe(struct platform_device *pdev)
        dcdc->desc.type = REGULATOR_VOLTAGE;
        dcdc->desc.ops = &wm831x_boostp_ops;
        dcdc->desc.owner = THIS_MODULE;
+       dcdc->desc.enable_reg = WM831X_DCDC_ENABLE;
+       dcdc->desc.enable_mask = 1 << id;
 
        config.dev = pdev->dev.parent;
        config.init_data = pdata->dcdc[id];
        config.driver_data = dcdc;
+       config.regmap = wm831x->regmap;
 
        dcdc->regulator = regulator_register(&dcdc->desc, &config);
        if (IS_ERR(dcdc->regulator)) {
@@ -951,9 +909,9 @@ static struct platform_driver wm831x_boostp_driver = {
 #define WM831X_EPE_BASE 6
 
 static struct regulator_ops wm831x_epe_ops = {
-       .is_enabled = wm831x_dcdc_is_enabled,
-       .enable = wm831x_dcdc_enable,
-       .disable = wm831x_dcdc_disable,
+       .is_enabled = regulator_is_enabled_regmap,
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
        .get_status = wm831x_dcdc_get_status,
 };
 
@@ -968,9 +926,6 @@ static __devinit int wm831x_epe_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "Probing EPE%d\n", id + 1);
 
-       if (pdata == NULL || pdata->epe[id] == NULL)
-               return -ENODEV;
-
        dcdc = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_dcdc), GFP_KERNEL);
        if (dcdc == NULL) {
                dev_err(&pdev->dev, "Unable to allocate private data\n");
@@ -988,10 +943,14 @@ static __devinit int wm831x_epe_probe(struct platform_device *pdev)
        dcdc->desc.ops = &wm831x_epe_ops;
        dcdc->desc.type = REGULATOR_VOLTAGE;
        dcdc->desc.owner = THIS_MODULE;
+       dcdc->desc.enable_reg = WM831X_DCDC_ENABLE;
+       dcdc->desc.enable_mask = 1 << dcdc->desc.id;
 
        config.dev = pdev->dev.parent;
-       config.init_data = pdata->epe[id];
+       if (pdata)
+               config.init_data = pdata->epe[id];
        config.driver_data = dcdc;
+       config.regmap = wm831x->regmap;
 
        dcdc->regulator = regulator_register(&dcdc->desc, &config);
        if (IS_ERR(dcdc->regulator)) {