diff options
author | Tony Lindgren <tony@atomide.com> | 2011-03-11 12:39:58 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-03-11 12:39:58 -0500 |
commit | 0d9596958d0be59e6bb373b5e6bc0729cbba5110 (patch) | |
tree | 516886b4e5a626c4b8c6d013e631b7234ef34128 /arch/arm/mach-omap2/opp4xxx_data.c | |
parent | a2358a7bc35e388978fc2f7f6b071a0fd27d78c1 (diff) | |
parent | 5e7c58dc8d9b7f31d418cf98c6a8cad84b86f510 (diff) |
Merge branch 'for_2.6.39/pm-integration' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/opp4xxx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/opp4xxx_data.c | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/arch/arm/mach-omap2/opp4xxx_data.c b/arch/arm/mach-omap2/opp4xxx_data.c index 5030794d73ff..2293ba27101b 100644 --- a/arch/arm/mach-omap2/opp4xxx_data.c +++ b/arch/arm/mach-omap2/opp4xxx_data.c | |||
@@ -31,10 +31,10 @@ | |||
31 | * voltage dependent data for each VDD. | 31 | * voltage dependent data for each VDD. |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #define OMAP4430_VDD_MPU_OPP50_UV 930000 | 34 | #define OMAP4430_VDD_MPU_OPP50_UV 1025000 |
35 | #define OMAP4430_VDD_MPU_OPP100_UV 1100000 | 35 | #define OMAP4430_VDD_MPU_OPP100_UV 1200000 |
36 | #define OMAP4430_VDD_MPU_OPPTURBO_UV 1260000 | 36 | #define OMAP4430_VDD_MPU_OPPTURBO_UV 1313000 |
37 | #define OMAP4430_VDD_MPU_OPPNITRO_UV 1350000 | 37 | #define OMAP4430_VDD_MPU_OPPNITRO_UV 1375000 |
38 | 38 | ||
39 | struct omap_volt_data omap44xx_vdd_mpu_volt_data[] = { | 39 | struct omap_volt_data omap44xx_vdd_mpu_volt_data[] = { |
40 | VOLT_DATA_DEFINE(OMAP4430_VDD_MPU_OPP50_UV, OMAP44XX_CONTROL_FUSE_MPU_OPP50, 0xf4, 0x0c), | 40 | VOLT_DATA_DEFINE(OMAP4430_VDD_MPU_OPP50_UV, OMAP44XX_CONTROL_FUSE_MPU_OPP50, 0xf4, 0x0c), |
@@ -44,9 +44,9 @@ struct omap_volt_data omap44xx_vdd_mpu_volt_data[] = { | |||
44 | VOLT_DATA_DEFINE(0, 0, 0, 0), | 44 | VOLT_DATA_DEFINE(0, 0, 0, 0), |
45 | }; | 45 | }; |
46 | 46 | ||
47 | #define OMAP4430_VDD_IVA_OPP50_UV 930000 | 47 | #define OMAP4430_VDD_IVA_OPP50_UV 1013000 |
48 | #define OMAP4430_VDD_IVA_OPP100_UV 1100000 | 48 | #define OMAP4430_VDD_IVA_OPP100_UV 1188000 |
49 | #define OMAP4430_VDD_IVA_OPPTURBO_UV 1260000 | 49 | #define OMAP4430_VDD_IVA_OPPTURBO_UV 1300000 |
50 | 50 | ||
51 | struct omap_volt_data omap44xx_vdd_iva_volt_data[] = { | 51 | struct omap_volt_data omap44xx_vdd_iva_volt_data[] = { |
52 | VOLT_DATA_DEFINE(OMAP4430_VDD_IVA_OPP50_UV, OMAP44XX_CONTROL_FUSE_IVA_OPP50, 0xf4, 0x0c), | 52 | VOLT_DATA_DEFINE(OMAP4430_VDD_IVA_OPP50_UV, OMAP44XX_CONTROL_FUSE_IVA_OPP50, 0xf4, 0x0c), |
@@ -55,8 +55,8 @@ struct omap_volt_data omap44xx_vdd_iva_volt_data[] = { | |||
55 | VOLT_DATA_DEFINE(0, 0, 0, 0), | 55 | VOLT_DATA_DEFINE(0, 0, 0, 0), |
56 | }; | 56 | }; |
57 | 57 | ||
58 | #define OMAP4430_VDD_CORE_OPP50_UV 930000 | 58 | #define OMAP4430_VDD_CORE_OPP50_UV 1025000 |
59 | #define OMAP4430_VDD_CORE_OPP100_UV 1100000 | 59 | #define OMAP4430_VDD_CORE_OPP100_UV 1200000 |
60 | 60 | ||
61 | struct omap_volt_data omap44xx_vdd_core_volt_data[] = { | 61 | struct omap_volt_data omap44xx_vdd_core_volt_data[] = { |
62 | VOLT_DATA_DEFINE(OMAP4430_VDD_CORE_OPP50_UV, OMAP44XX_CONTROL_FUSE_CORE_OPP50, 0xf4, 0x0c), | 62 | VOLT_DATA_DEFINE(OMAP4430_VDD_CORE_OPP50_UV, OMAP44XX_CONTROL_FUSE_CORE_OPP50, 0xf4, 0x0c), |
@@ -67,18 +67,24 @@ struct omap_volt_data omap44xx_vdd_core_volt_data[] = { | |||
67 | 67 | ||
68 | static struct omap_opp_def __initdata omap44xx_opp_def_list[] = { | 68 | static struct omap_opp_def __initdata omap44xx_opp_def_list[] = { |
69 | /* MPU OPP1 - OPP50 */ | 69 | /* MPU OPP1 - OPP50 */ |
70 | OPP_INITIALIZER("mpu", true, 300000000, 1100000), | 70 | OPP_INITIALIZER("mpu", true, 300000000, OMAP4430_VDD_MPU_OPP50_UV), |
71 | /* MPU OPP2 - OPP100 */ | 71 | /* MPU OPP2 - OPP100 */ |
72 | OPP_INITIALIZER("mpu", true, 600000000, 1200000), | 72 | OPP_INITIALIZER("mpu", true, 600000000, OMAP4430_VDD_MPU_OPP100_UV), |
73 | /* MPU OPP3 - OPP-Turbo */ | 73 | /* MPU OPP3 - OPP-Turbo */ |
74 | OPP_INITIALIZER("mpu", false, 800000000, 1260000), | 74 | OPP_INITIALIZER("mpu", true, 800000000, OMAP4430_VDD_MPU_OPPTURBO_UV), |
75 | /* MPU OPP4 - OPP-SB */ | 75 | /* MPU OPP4 - OPP-SB */ |
76 | OPP_INITIALIZER("mpu", false, 1008000000, 1350000), | 76 | OPP_INITIALIZER("mpu", true, 1008000000, OMAP4430_VDD_MPU_OPPNITRO_UV), |
77 | /* L3 OPP1 - OPP50 */ | 77 | /* L3 OPP1 - OPP50 */ |
78 | OPP_INITIALIZER("l3_main_1", true, 100000000, 930000), | 78 | OPP_INITIALIZER("l3_main_1", true, 100000000, OMAP4430_VDD_CORE_OPP50_UV), |
79 | /* L3 OPP2 - OPP100, OPP-Turbo, OPP-SB */ | 79 | /* L3 OPP2 - OPP100, OPP-Turbo, OPP-SB */ |
80 | OPP_INITIALIZER("l3_main_1", true, 200000000, 1100000), | 80 | OPP_INITIALIZER("l3_main_1", true, 200000000, OMAP4430_VDD_CORE_OPP100_UV), |
81 | /* TODO: add IVA, DSP, aess, fdif, gpu */ | 81 | /* IVA OPP1 - OPP50 */ |
82 | OPP_INITIALIZER("iva", true, 133000000, OMAP4430_VDD_IVA_OPP50_UV), | ||
83 | /* IVA OPP2 - OPP100 */ | ||
84 | OPP_INITIALIZER("iva", true, 266100000, OMAP4430_VDD_IVA_OPP100_UV), | ||
85 | /* IVA OPP3 - OPP-Turbo */ | ||
86 | OPP_INITIALIZER("iva", false, 332000000, OMAP4430_VDD_IVA_OPPTURBO_UV), | ||
87 | /* TODO: add DSP, aess, fdif, gpu */ | ||
82 | }; | 88 | }; |
83 | 89 | ||
84 | /** | 90 | /** |