lkml.org 
[lkml]   [2012]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v2 3/3] regulator: wm831x-dcdc: Convert wm831x_buckv_ops to set_voltage_sel and map_voltage
    From
    Date
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    drivers/regulator/wm831x-dcdc.c | 21 ++++++++-------------
    1 file changed, 8 insertions(+), 13 deletions(-)

    diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
    index 91b5b0a..7413885 100644
    --- a/drivers/regulator/wm831x-dcdc.c
    +++ b/drivers/regulator/wm831x-dcdc.c
    @@ -215,8 +215,8 @@ static int wm831x_buckv_list_voltage(struct regulator_dev *rdev,
    return -EINVAL;
    }

    -static int wm831x_buckv_select_min_voltage(struct regulator_dev *rdev,
    - int min_uV, int max_uV)
    +static int wm831x_buckv_map_voltage(struct regulator_dev *rdev,
    + int min_uV, int max_uV)
    {
    u16 vsel;

    @@ -251,20 +251,14 @@ static int wm831x_buckv_set_dvs(struct regulator_dev *rdev, int state)
    return 0;
    }

    -static int wm831x_buckv_set_voltage(struct regulator_dev *rdev,
    - int min_uV, int max_uV, unsigned *selector)
    +static int wm831x_buckv_set_voltage_sel(struct regulator_dev *rdev,
    + unsigned vsel)
    {
    struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
    struct wm831x *wm831x = dcdc->wm831x;
    int on_reg = dcdc->base + WM831X_DCDC_ON_CONFIG;
    int dvs_reg = dcdc->base + WM831X_DCDC_DVS_CONTROL;
    - int vsel, ret;
    -
    - vsel = wm831x_buckv_select_min_voltage(rdev, min_uV, max_uV);
    - if (vsel < 0)
    - return vsel;
    -
    - *selector = vsel;
    + int ret;

    /* If this value is already set then do a GPIO update if we can */
    if (dcdc->dvs_gpio && dcdc->on_vsel == vsel)
    @@ -315,7 +309,7 @@ static int wm831x_buckv_set_suspend_voltage(struct regulator_dev *rdev,
    u16 reg = dcdc->base + WM831X_DCDC_SLEEP_CONTROL;
    int vsel;

    - vsel = wm831x_buckv_select_min_voltage(rdev, uV, uV);
    + vsel = wm831x_buckv_map_voltage(rdev, uV, uV);
    if (vsel < 0)
    return vsel;

    @@ -373,9 +367,10 @@ static int wm831x_buckv_get_current_limit(struct regulator_dev *rdev)
    }

    static struct regulator_ops wm831x_buckv_ops = {
    - .set_voltage = wm831x_buckv_set_voltage,
    + .set_voltage_sel = wm831x_buckv_set_voltage_sel,
    .get_voltage_sel = wm831x_buckv_get_voltage_sel,
    .list_voltage = wm831x_buckv_list_voltage,
    + .map_voltage = wm831x_buckv_map_voltage,
    .set_suspend_voltage = wm831x_buckv_set_suspend_voltage,
    .set_current_limit = wm831x_buckv_set_current_limit,
    .get_current_limit = wm831x_buckv_get_current_limit,
    --
    1.7.9.5




    \
     
     \ /
      Last update: 2012-06-13 15:01    [W:0.026 / U:0.880 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site