projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c8d6f4f)
rk3168:rk3188:tps65910:support new tps65910 eeprom
author张晴 <zhangqing@rock-chips.com>
Fri, 25 Jan 2013 11:40:15 +0000 (19:40 +0800)
committer张晴 <zhangqing@rock-chips.com>
Fri, 25 Jan 2013 11:40:15 +0000 (19:40 +0800)
arch/arm/mach-rk30/board-pmu-tps65910.c patch | blob | history
arch/arm/mach-rk30/board-rk3168-ds1006h.c [changed mode: 0644->0755] patch | blob | history
arch/arm/mach-rk30/board-rk3168-tb.c patch | blob | history
arch/arm/mach-rk3188/board-rk3188-ds1006h.c [changed mode: 0644->0755] patch | blob | history

diff --git a/arch/arm/mach-rk30/board-pmu-tps65910.c b/arch/arm/mach-rk30/board-pmu-tps65910.c
index ca3762bac09b365d51a804b78c179c37d8dd6446..95d30a4de6c62658769d53366999bf33b50c9780 100755 (executable)
--- a/arch/arm/mach-rk30/board-pmu-tps65910.c
+++ b/arch/arm/mach-rk30/board-pmu-tps65910.c
@@ -305,9 +305,15 @@ static struct regulator_consumer_supply tps65910_smps1_supply[] = {
        {
                .supply = "vdd1",
        },
+       #if defined(CONFIG_SOC_RK3168) || defined(CONFIG_ARCH_RK3188)
+       {
+               .supply = "vdd_core",
+       },
+       #else
        {
                .supply = "vdd_cpu",
        },
+       #endif
 };
 static struct regulator_consumer_supply tps65910_smps2_supply[] = {
        {
diff --git a/arch/arm/mach-rk30/board-rk3168-ds1006h.c b/arch/arm/mach-rk30/board-rk3168-ds1006h.c
old mode 100644 (file)
new mode 100755 (executable)
index f253199..acb2a94
--- a/arch/arm/mach-rk30/board-rk3168-ds1006h.c
+++ b/arch/arm/mach-rk30/board-rk3168-ds1006h.c
@@ -815,7 +815,7 @@ static int pwm_voltage_map[] = {
 
 static struct regulator_consumer_supply pwm_dcdc1_consumers[] = {
        {
-               .supply = "vdd_core",
+               .supply = "vdd_cpu",
        }
 };
 
@@ -1358,9 +1358,9 @@ static struct pmu_info  wm8326_ldo_info[] = {
 
 static struct pmu_info  tps65910_dcdc_info[] = {
        {
-               .name          = "vdd_cpu",   //arm
-               .min_uv          = 1000000,
-               .max_uv         = 1000000,
+               .name          = "vdd_core",   //logic
+               .min_uv          = 1100000,
+               .max_uv         = 1100000,
        },
        {
                .name          = "vdd2",    //ddr
@@ -1376,9 +1376,9 @@ static struct pmu_info  tps65910_dcdc_info[] = {
 };
 static  struct pmu_info  tps65910_ldo_info[] = {
        {
-               .name          = "vpll",   //vcc25
-               .min_uv          = 2500000,
-               .max_uv         = 2500000,
+               .name          = "vpll",   //vdd10
+               .min_uv          = 1000000,
+               .max_uv         = 1000000,
        },
        {
                .name          = "vdig1",    //vcc18_cif
@@ -1386,14 +1386,14 @@ static  struct pmu_info  tps65910_ldo_info[] = {
                .max_uv         = 1800000,
        },
        {
-               .name          = "vdig2",   //vdd11
-               .min_uv          = 1000000,
-               .max_uv         = 1000000,
+               .name          = "vdig2",   //vdd_jetta
+               .min_uv          = 1200000,
+               .max_uv         = 1200000,
        },
        {
-               .name          = "vaux1",   //vcc25_hdmi
-               .min_uv          = 2500000,
-               .max_uv         = 2500000,
+               .name          = "vaux1",   //vcc28_cif
+               .min_uv          = 2800000,
+               .max_uv         = 2800000,
        },
        {
                .name          = "vaux2",   //vcca33
@@ -1406,12 +1406,12 @@ static  struct pmu_info  tps65910_ldo_info[] = {
                .max_uv         = 3300000,
        },
        {
-               .name          = "vmmc",   //vcc28_cif
-               .min_uv          = 2800000,
-               .max_uv         = 2800000,
+               .name          = "vmmc",   //vcc30
+               .min_uv          = 3000000,
+               .max_uv         = 3000000,
        },
        {
-               .name          = "vdac",   //vccio_wl
+               .name          = "vdac",   //vcc18
                .min_uv          = 1800000,
                .max_uv         = 1800000,
        },
diff --git a/arch/arm/mach-rk30/board-rk3168-tb.c b/arch/arm/mach-rk30/board-rk3168-tb.c
index 7b9bb93e043da43d4ed00f6080015397d85c86b6..56d498296f5c77368e0085c6f376ac8bab552cc4 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk3168-tb.c
+++ b/arch/arm/mach-rk30/board-rk3168-tb.c
@@ -1027,7 +1027,7 @@ const static int pwm_voltage_map[] = {
 
 static struct regulator_consumer_supply pwm_dcdc1_consumers[] = {
        {
-               .supply = "vdd_core",
+               .supply = "vdd_cpu",
        }
 };
 
@@ -1498,9 +1498,9 @@ static struct pmu_info  wm8326_ldo_info[] = {
 
 static struct pmu_info  tps65910_dcdc_info[] = {
        {
-               .name          = "vdd_cpu",   //arm
-               .min_uv          = 1000000,
-               .max_uv         = 1000000,
+               .name          = "vdd_core",   //logic
+               .min_uv          = 1100000,
+               .max_uv         = 1100000,
        },
        {
                .name          = "vdd2",    //ddr
@@ -1516,9 +1516,9 @@ static struct pmu_info  tps65910_dcdc_info[] = {
 };
 static  struct pmu_info  tps65910_ldo_info[] = {
        {
-               .name          = "vpll",   //vcc25
-               .min_uv          = 2500000,
-               .max_uv         = 2500000,
+               .name          = "vpll",   //vdd10
+               .min_uv          = 1000000,
+               .max_uv         = 1000000,
        },
        {
                .name          = "vdig1",    //vcc18_cif
@@ -1526,14 +1526,14 @@ static  struct pmu_info  tps65910_ldo_info[] = {
                .max_uv         = 1800000,
        },
        {
-               .name          = "vdig2",   //vdd11
-               .min_uv          = 1000000,
-               .max_uv         = 1000000,
+               .name          = "vdig2",   //vdd_jetta
+               .min_uv          = 1200000,
+               .max_uv         = 1200000,
        },
        {
-               .name          = "vaux1",   //vcc25_hdmi
-               .min_uv          = 2500000,
-               .max_uv         = 2500000,
+               .name          = "vaux1",   //vcc28_cif
+               .min_uv          = 2800000,
+               .max_uv         = 2800000,
        },
        {
                .name          = "vaux2",   //vcca33
@@ -1546,12 +1546,12 @@ static  struct pmu_info  tps65910_ldo_info[] = {
                .max_uv         = 3300000,
        },
        {
-               .name          = "vmmc",   //vcc28_cif
-               .min_uv          = 2800000,
-               .max_uv         = 2800000,
+               .name          = "vmmc",   //vcc30
+               .min_uv          = 3000000,
+               .max_uv         = 3000000,
        },
        {
-               .name          = "vdac",   //vccio_wl
+               .name          = "vdac",   //vcc18
                .min_uv          = 1800000,
                .max_uv         = 1800000,
        },
diff --git a/arch/arm/mach-rk3188/board-rk3188-ds1006h.c b/arch/arm/mach-rk3188/board-rk3188-ds1006h.c
old mode 100644 (file)
new mode 100755 (executable)
index f61b97a..1c4ee2e
--- a/arch/arm/mach-rk3188/board-rk3188-ds1006h.c
+++ b/arch/arm/mach-rk3188/board-rk3188-ds1006h.c
@@ -815,7 +815,7 @@ static int pwm_voltage_map[] = {
 
 static struct regulator_consumer_supply pwm_dcdc1_consumers[] = {
        {
-               .supply = "vdd_core",
+               .supply = "vdd_cpu",
        }
 };
 
@@ -1358,9 +1358,9 @@ static struct pmu_info  wm8326_ldo_info[] = {
 
 static struct pmu_info  tps65910_dcdc_info[] = {
        {
-               .name          = "vdd_cpu",   //arm
-               .min_uv          = 1000000,
-               .max_uv         = 1000000,
+               .name          = "vdd_core",   //logic
+               .min_uv          = 1100000,
+               .max_uv         = 1100000,
        },
        {
                .name          = "vdd2",    //ddr
@@ -1376,9 +1376,9 @@ static struct pmu_info  tps65910_dcdc_info[] = {
 };
 static  struct pmu_info  tps65910_ldo_info[] = {
        {
-               .name          = "vpll",   //vcc25
-               .min_uv          = 2500000,
-               .max_uv         = 2500000,
+               .name          = "vpll",   //vdd10
+               .min_uv          = 1000000,
+               .max_uv         = 1000000,
        },
        {
                .name          = "vdig1",    //vcc18_cif
@@ -1386,14 +1386,14 @@ static  struct pmu_info  tps65910_ldo_info[] = {
                .max_uv         = 1800000,
        },
        {
-               .name          = "vdig2",   //vdd11
-               .min_uv          = 1000000,
-               .max_uv         = 1000000,
+               .name          = "vdig2",   //vdd_jetta
+               .min_uv          = 1200000,
+               .max_uv         = 1200000,
        },
        {
-               .name          = "vaux1",   //vcc25_hdmi
-               .min_uv          = 2500000,
-               .max_uv         = 2500000,
+               .name          = "vaux1",   //vcc28_cif
+               .min_uv          = 2800000,
+               .max_uv         = 2800000,
        },
        {
                .name          = "vaux2",   //vcca33
@@ -1406,12 +1406,12 @@ static  struct pmu_info  tps65910_ldo_info[] = {
                .max_uv         = 3300000,
        },
        {
-               .name          = "vmmc",   //vcc28_cif
-               .min_uv          = 2800000,
-               .max_uv         = 2800000,
+               .name          = "vmmc",   //vcc30
+               .min_uv          = 3000000,
+               .max_uv         = 3000000,
        },
        {
-               .name          = "vdac",   //vccio_wl
+               .name          = "vdac",   //vcc18
                .min_uv          = 1800000,
                .max_uv         = 1800000,
        },
Unnamed repository; edit this file 'description' to name the repository.