temp revert rk change

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / wm831x-dcdc.c

diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index 275fd7ad7ce705b422be0172d94cb61742d3fec4..dbfaf5945e48a683c20cd87ff185dfc816b789e7 100755 (executable)
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -27,18 +27,6 @@
 #include <linux/mfd/wm831x/regulator.h>
 #include <linux/mfd/wm831x/pdata.h>
 
-#include <linux/delay.h>
-#include <linux/time.h>
-#include <linux/timer.h>
-#include <linux/string.h>
-
-//#include "../../arch/arm/mach-rk29/include/mach/gpio.h"
-
-//#include <linux/hrtimer.h>
-
-
-
-
 #define WM831X_BUCKV_MAX_SELECTOR 0x68
 #define WM831X_BUCKP_MAX_SELECTOR 0x66
 
@@ -47,7 +35,7 @@
 #define WM831X_DCDC_MODE_IDLE    2
 #define WM831X_DCDC_MODE_STANDBY 3
 
-//#define WM831X_DCDC_MAX_NAME 6
+#define WM831X_DCDC_MAX_NAME 6
 
 /* Register offsets in control block */
 #define WM831X_DCDC_CONTROL_1     0
@@ -59,7 +47,7 @@
 /*
  * Shared
  */
-#if 0
+
 struct wm831x_dcdc {
        char name[WM831X_DCDC_MAX_NAME];
        struct regulator_desc desc;
@@ -71,7 +59,6 @@ struct wm831x_dcdc {
        int on_vsel;
        int dvs_vsel;
 };
-#endif
 
 static int wm831x_dcdc_is_enabled(struct regulator_dev *rdev)
 {
@@ -313,28 +300,7 @@ static int wm831x_buckv_set_dvs(struct regulator_dev *rdev, int state)
 
        return 0;
 }
-//wm831x_buckv_get_voltage
-
-int wm831x_reg_read(struct wm831x *wm831x, unsigned short reg);
-static int wm831x_buckv_read_voltage(struct regulator_dev *rdev)
-{
-       int vol_read;
-       int ret;
-       struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
-       struct wm831x *wm831x = dcdc->wm831x;
-       int on_reg = dcdc->base + WM831X_DCDC_ON_CONFIG;
 
-       ret = wm831x_reg_read(wm831x, on_reg);
-       if (ret < 0)
-               return ret;
-       ret &= WM831X_DC1_ON_VSEL_MASK;
-       vol_read = (ret-8)*12500 + 600000;
-
-       return vol_read;
-
-
-
-}
 static int wm831x_buckv_set_voltage(struct regulator_dev *rdev,
                                    int min_uV, int max_uV)
 {
@@ -424,78 +390,6 @@ static u16 wm831x_dcdc_ilim[] = {
        125, 250, 375, 500, 625, 750, 875, 1000
 };
 
-static int wm831x_buckv_set_voltage_step(struct regulator_dev * rdev, int min_uV, int max_uV)
-{
-       int old_vol;
-       int new_min_uV,new_max_uV;
-       int diff_value,step;
-       int ret=0;
-
-       struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev); 
-       struct wm831x *wm831x = dcdc->wm831x; 
-       struct wm831x_pdata *pdata = wm831x->dev->platform_data;
-
-
-       //if(strcmp(rdev->constraints->name,"DCDC2") != 0)
-       if(strcmp(pdata->dcdc[1]->consumer_supplies[1].supply,"vcore") != 0)
-       {
-       
-               ret = wm831x_buckv_set_voltage(rdev,min_uV,max_uV);
-       }
-       else
-       {
-               old_vol = wm831x_buckv_read_voltage(rdev);
-               
-               new_min_uV = old_vol;
-               new_max_uV = old_vol+max_uV-min_uV;
-
-               if(old_vol > min_uV) //reduce voltage
-               {
-                       diff_value = (old_vol - min_uV);  
-
-                       for(step = 100000; step<=diff_value; step += 100000)
-                       {
-                               new_min_uV = old_vol-step;
-                               new_max_uV = old_vol+max_uV-min_uV-step;
-
-                               ret = wm831x_buckv_set_voltage(rdev,new_min_uV,new_max_uV);
-                               usleep_range(1000,1000);
-                       }
-
-                       if(new_min_uV > min_uV) //0<  old_vol - min_uV < 100000 ||0< new_min_uV  - min_uV < 1000000
-                       {
-
-                               ret = wm831x_buckv_set_voltage(rdev,min_uV,max_uV);
-                               usleep_range(1000,1000);
-                               
-                       }
-
-               }
-               else                    //rise  voltage
-               {
-                       diff_value = (min_uV- old_vol); 
-
-                       for(step = 100000; step<=diff_value; step += 100000)
-                       {
-                               new_min_uV = old_vol + step;
-                               new_max_uV = old_vol+max_uV-min_uV+step;
-
-                               ret = wm831x_buckv_set_voltage(rdev,new_min_uV,new_max_uV);
-                               usleep_range(1000,1000);        
-                       }
-                       if(new_min_uV < min_uV)//  min_uV - old_vol < 100000 || new_min_uV - old_vol < 100000
-                       {
-                               ret = wm831x_buckv_set_voltage(rdev,min_uV,max_uV);
-                               usleep_range(1000,1000);                
-                       }
-
-               }
-
-       }
-       return ret;
-
-}
-
 static int wm831x_buckv_set_current_limit(struct regulator_dev *rdev,
                                           int min_uA, int max_uA)
 {
@@ -528,19 +422,8 @@ static int wm831x_buckv_get_current_limit(struct regulator_dev *rdev)
        return wm831x_dcdc_ilim[val & WM831X_DC1_HC_THR_MASK];
 }
 
-int wm831x_dcdc_set_suspend_enable(struct regulator_dev *rdev)
-{
-
-        return 0;
-}
-int wm831x_dcdc_set_suspend_disable(struct regulator_dev *rdev)
-{
-
-        return 0;
-}
-
 static struct regulator_ops wm831x_buckv_ops = {
-       .set_voltage = wm831x_buckv_set_voltage_step,
+       .set_voltage = wm831x_buckv_set_voltage,
        .get_voltage = wm831x_buckv_get_voltage,
        .list_voltage = wm831x_buckv_list_voltage,
        .set_suspend_voltage = wm831x_buckv_set_suspend_voltage,
@@ -554,8 +437,6 @@ static struct regulator_ops wm831x_buckv_ops = {
        .get_mode = wm831x_dcdc_get_mode,
        .set_mode = wm831x_dcdc_set_mode,
        .set_suspend_mode = wm831x_dcdc_set_suspend_mode,
-       .set_suspend_enable = wm831x_dcdc_set_suspend_enable,
-       .set_suspend_disable = wm831x_dcdc_set_suspend_disable,
 };
 
 /*
@@ -624,7 +505,7 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
        struct wm831x_dcdc *dcdc;
        struct resource *res;
        int ret, irq;
-       
+
        dev_dbg(&pdev->dev, "Probing DCDC%d\n", id + 1);
 
        if (pdata == NULL || pdata->dcdc[id] == NULL)
@@ -817,8 +698,6 @@ static struct regulator_ops wm831x_buckp_ops = {
        .get_mode = wm831x_dcdc_get_mode,
        .set_mode = wm831x_dcdc_set_mode,
        .set_suspend_mode = wm831x_dcdc_set_suspend_mode,
-       .set_suspend_enable = wm831x_dcdc_set_suspend_enable,
-       .set_suspend_disable = wm831x_dcdc_set_suspend_disable,
 };
 
 static __devinit int wm831x_buckp_probe(struct platform_device *pdev)
@@ -1130,7 +1009,6 @@ static struct platform_driver wm831x_epe_driver = {
 static int __init wm831x_dcdc_init(void)
 {
        int ret;
-       printk("%s \n", __FUNCTION__);  
        ret = platform_driver_register(&wm831x_buckv_driver);
        if (ret != 0)
                pr_err("Failed to register WM831x BUCKV driver: %d\n", ret);
@@ -1146,7 +1024,7 @@ static int __init wm831x_dcdc_init(void)
        ret = platform_driver_register(&wm831x_epe_driver);
        if (ret != 0)
                pr_err("Failed to register WM831x EPE driver: %d\n", ret);
-       
+
        return 0;
 }
 subsys_initcall(wm831x_dcdc_init);