rk31:rt5025:modify rt5025 defult voltage

diff --git a/arch/arm/mach-rk30/board-pmu-rt5025.c b/arch/arm/mach-rk30/board-pmu-rt5025.c
index 7b48c7b0b808902a4d52bd3128461a8fa7f944ee..f0f0fc567118261ef25aeb6d19ae4785a09bf86c 100755 (executable)
--- a/arch/arm/mach-rk30/board-pmu-rt5025.c
+++ b/arch/arm/mach-rk30/board-pmu-rt5025.c
@@ -37,6 +37,10 @@ static int rt5025_pre_init(struct rt5025_chip *rt5025_chip){
        ret |= (1<<3);  //enable DC4 boost
        rt5025_reg_write(rt5025_chip->i2c, 0x17,ret);
        /***********************************************/
+        ret = rt5025_reg_read(rt5025_chip->i2c, 0x07);
+        ret |= (1<<5);  //
+        rt5025_reg_write(rt5025_chip->i2c, 0x07,ret);
+
        /************************************************/
        return 0;
   }
@@ -86,18 +90,18 @@ static struct regulator_consumer_supply rt5025_dcdc1_supply[] = {
        {
                .supply = "rt5025-dcdc1",
        },
-//     {
-//             .supply = "vdd_cpu",
-//     },
+       {
+               .supply = "vdd_cpu",
+       },
        
 };
 static struct regulator_consumer_supply rt5025_dcdc2_supply[] = {
        {
                .supply = "rt5025-dcdc2",
        },
-//     {
-//             .supply = "vdd_core",
-//     },
+       {
+               .supply = "vdd_core",
+       },
 };
 static struct regulator_consumer_supply rt5025_dcdc3_supply[] = {
        {
@@ -298,7 +302,7 @@ static struct rt5025_power_data rt5025_power_data = {
        .CHGControl7 = {
                .bitfield = {
                        .CHGC_EN = 1,
-                       .CHG_DCDC_MODE = 0,
+                       .CHG_DCDC_MODE = 1,
                        .BATD_EN = 0,
                },
        },

diff --git a/arch/arm/mach-rk30/board-rk3168-tb.c b/arch/arm/mach-rk30/board-rk3168-tb.c
index 677aefa727f8f7658e8a2339ab297f69fbb0bf53..824b46b67d635913b4c6e06d9e3deb20de8c6663 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk3168-tb.c
+++ b/arch/arm/mach-rk30/board-rk3168-tb.c
@@ -2087,12 +2087,12 @@ static  struct pmu_info  ricoh619_ldo_info[] = {
 
 static struct pmu_info  rt5025_dcdc_info[] = {
        {
-               .name          = "rt5025-dcdc1",   //arm
+               .name          = "vdd_cpu",   //arm
                .min_uv          = 1000000,
                .max_uv         = 1000000,
        },
        {
-               .name          = "rt5025-dcdc2",    //logic
+               .name          = "vdd_core",    //logic
                .min_uv          = 1000000,
                .max_uv         = 1000000,
        },
@@ -2106,9 +2106,9 @@ static struct pmu_info  rt5025_dcdc_info[] = {
 };
 static  struct pmu_info  rt5025_ldo_info[] = {
        {
-               .name          = "rt5025-ldo1",   //vdd10
-               .min_uv          = 1000000,
-               .max_uv         = 1000000,
+               .name          = "rt5025-ldo1",   //vcc18
+               .min_uv          = 1800000,
+               .max_uv         = 1800000,
        },
        {
                .name          = "rt5025-ldo2",    //vddjetta
@@ -2116,9 +2116,9 @@ static  struct pmu_info  rt5025_ldo_info[] = {
                .max_uv         = 1200000,
        },
        {
-               .name          = "rt5025-ldo3",   //vcc18
-               .min_uv          = 1800000,
-               .max_uv         = 1800000,
+               .name          = "rt5025-ldo3",   //vdd10
+               .min_uv          = 1200000,
+               .max_uv         = 1200000,
        },
        {
                .name          = "rt5025-ldo4",   //vccjetta
@@ -2126,14 +2126,14 @@ static  struct pmu_info  rt5025_ldo_info[] = {
                .max_uv         = 3300000,
        },
        {
-               .name          = "rt5025-ldo5",   //vcctp
-               .min_uv          = 3300000,
-               .max_uv         = 3300000,
-       },
-       {
-               .name          = "rt5025-ldo6",   //vccio_wl
+               .name          = "rt5025-ldo5",   //vccio_wl
                .min_uv          = 1800000,
                .max_uv         = 1800000,
+       },
+       {
+               .name          = "rt5025-ldo6",   //vcc_tp
+               .min_uv          = 3300000,
+               .max_uv         = 3300000,
        },      
        
  };