regulator: rk29-pwm: enable pwm clock on probe
author黄涛 <huangtao@rock-chips.com>
Tue, 18 Jan 2011 08:20:43 +0000 (16:20 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 18 Jan 2011 08:59:12 +0000 (16:59 +0800)
drivers/regulator/rk29-pwm-regulator.c

index 7f5b10ee9722ec13db15985152ada59f89b521ae..8b998eb5e9b6c4eba34742244aec996ae028abf7 100644 (file)
@@ -60,12 +60,13 @@ const static int pwm_voltage_map[] = {
        950, 975, 1000, 1025, 1050, 1075, 1100, 1125, 1150, 1175, 1200, 1225, 1250, 1275, 1300, 1325, 1350, 1375, 1400\r
 };\r
 \r
+static struct clk *pwm_clk;\r
+\r
 static int pwm_set_rate(struct pwm_platform_data *pdata,int nHz,u32 rate)\r
 {\r
     u32 divh,divTotal;\r
     int id = pdata->pwm_id;\r
     unsigned long clkrate;\r
-    struct clk *pwm_clk = clk_get(NULL, "pwm");\r
 \r
     clkrate = clk_get_rate(pwm_clk);\r
        \r
@@ -112,21 +113,6 @@ static int pwm_set_rate(struct pwm_platform_data *pdata,int nHz,u32 rate)
     return (0);\r
 }\r
 \r
-static int pwm_init(struct pwm_platform_data *pdata, int nHz, int rate)\r
-{\r
-\r
-       struct clk *pwm_clk = clk_get(NULL, "pwm");\r
-          \r
-       // pwm2 clk enable\r
-       clk_enable(pwm_clk);\r
-\r
-       if(pwm_set_rate(pdata,nHz,rate)!=0)\r
-               return -1;              \r
-\r
-\r
-       return 0;\r
-}\r
-\r
 static int pwm_regulator_list_voltage(struct regulator_dev *dev,unsigned int index)\r
 {\r
        DBG("Enter %s, index =%d\n",__FUNCTION__,index);\r
@@ -237,8 +223,9 @@ static int __devinit pwm_regulator_probe(struct platform_device *pdev)
                        goto err_gpio;\r
                }\r
 \r
-       //pwm_init(pdata,1000*1000,PWM_VCORE_130);\r
-       \r
+       pwm_clk = clk_get(NULL, "pwm");\r
+       clk_enable(pwm_clk);\r
+\r
 \r
        platform_set_drvdata(pdev, rdev);\r
        printk(KERN_INFO "pwm_regulator: driver initialized\n");\r