Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes

[pandora-kernel.git] / arch / arm / mach-omap2 / opp4xxx_data.c

diff --git a/arch/arm/mach-omap2/opp4xxx_data.c b/arch/arm/mach-omap2/opp4xxx_data.c
index fdee8d4..2293ba2 100644 (file)
--- a/arch/arm/mach-omap2/opp4xxx_data.c
+++ b/arch/arm/mach-omap2/opp4xxx_data.c
@@ -24,16 +24,17 @@
 
 #include "control.h"
 #include "omap_opp_data.h"
+#include "pm.h"
 
 /*
  * Structures containing OMAP4430 voltage supported and various
  * voltage dependent data for each VDD.
  */
 
-#define OMAP4430_VDD_MPU_OPP50_UV              930000
-#define OMAP4430_VDD_MPU_OPP100_UV             1100000
-#define OMAP4430_VDD_MPU_OPPTURBO_UV           1260000
-#define OMAP4430_VDD_MPU_OPPNITRO_UV           1350000
+#define OMAP4430_VDD_MPU_OPP50_UV              1025000
+#define OMAP4430_VDD_MPU_OPP100_UV             1200000
+#define OMAP4430_VDD_MPU_OPPTURBO_UV           1313000
+#define OMAP4430_VDD_MPU_OPPNITRO_UV           1375000
 
 struct omap_volt_data omap44xx_vdd_mpu_volt_data[] = {
        VOLT_DATA_DEFINE(OMAP4430_VDD_MPU_OPP50_UV, OMAP44XX_CONTROL_FUSE_MPU_OPP50, 0xf4, 0x0c),
@@ -43,9 +44,9 @@ struct omap_volt_data omap44xx_vdd_mpu_volt_data[] = {
        VOLT_DATA_DEFINE(0, 0, 0, 0),
 };
 
-#define OMAP4430_VDD_IVA_OPP50_UV              930000
-#define OMAP4430_VDD_IVA_OPP100_UV             1100000
-#define OMAP4430_VDD_IVA_OPPTURBO_UV           1260000
+#define OMAP4430_VDD_IVA_OPP50_UV              1013000
+#define OMAP4430_VDD_IVA_OPP100_UV             1188000
+#define OMAP4430_VDD_IVA_OPPTURBO_UV           1300000
 
 struct omap_volt_data omap44xx_vdd_iva_volt_data[] = {
        VOLT_DATA_DEFINE(OMAP4430_VDD_IVA_OPP50_UV, OMAP44XX_CONTROL_FUSE_IVA_OPP50, 0xf4, 0x0c),
@@ -54,8 +55,8 @@ struct omap_volt_data omap44xx_vdd_iva_volt_data[] = {
        VOLT_DATA_DEFINE(0, 0, 0, 0),
 };
 
-#define OMAP4430_VDD_CORE_OPP50_UV             930000
-#define OMAP4430_VDD_CORE_OPP100_UV            1100000
+#define OMAP4430_VDD_CORE_OPP50_UV             1025000
+#define OMAP4430_VDD_CORE_OPP100_UV            1200000
 
 struct omap_volt_data omap44xx_vdd_core_volt_data[] = {
        VOLT_DATA_DEFINE(OMAP4430_VDD_CORE_OPP50_UV, OMAP44XX_CONTROL_FUSE_CORE_OPP50, 0xf4, 0x0c),
@@ -66,24 +67,30 @@ struct omap_volt_data omap44xx_vdd_core_volt_data[] = {
 
 static struct omap_opp_def __initdata omap44xx_opp_def_list[] = {
        /* MPU OPP1 - OPP50 */
-       OPP_INITIALIZER("mpu", true, 300000000, 1100000),
+       OPP_INITIALIZER("mpu", true, 300000000, OMAP4430_VDD_MPU_OPP50_UV),
        /* MPU OPP2 - OPP100 */
-       OPP_INITIALIZER("mpu", true, 600000000, 1200000),
+       OPP_INITIALIZER("mpu", true, 600000000, OMAP4430_VDD_MPU_OPP100_UV),
        /* MPU OPP3 - OPP-Turbo */
-       OPP_INITIALIZER("mpu", false, 800000000, 1260000),
+       OPP_INITIALIZER("mpu", true, 800000000, OMAP4430_VDD_MPU_OPPTURBO_UV),
        /* MPU OPP4 - OPP-SB */
-       OPP_INITIALIZER("mpu", false, 1008000000, 1350000),
+       OPP_INITIALIZER("mpu", true, 1008000000, OMAP4430_VDD_MPU_OPPNITRO_UV),
        /* L3 OPP1 - OPP50 */
-       OPP_INITIALIZER("l3_main_1", true, 100000000, 930000),
+       OPP_INITIALIZER("l3_main_1", true, 100000000, OMAP4430_VDD_CORE_OPP50_UV),
        /* L3 OPP2 - OPP100, OPP-Turbo, OPP-SB */
-       OPP_INITIALIZER("l3_main_1", true, 200000000, 1100000),
-       /* TODO: add IVA, DSP, aess, fdif, gpu */
+       OPP_INITIALIZER("l3_main_1", true, 200000000, OMAP4430_VDD_CORE_OPP100_UV),
+       /* IVA OPP1 - OPP50 */
+       OPP_INITIALIZER("iva", true, 133000000, OMAP4430_VDD_IVA_OPP50_UV),
+       /* IVA OPP2 - OPP100 */
+       OPP_INITIALIZER("iva", true, 266100000, OMAP4430_VDD_IVA_OPP100_UV),
+       /* IVA OPP3 - OPP-Turbo */
+       OPP_INITIALIZER("iva", false, 332000000, OMAP4430_VDD_IVA_OPPTURBO_UV),
+       /* TODO: add DSP, aess, fdif, gpu */
 };
 
 /**
  * omap4_opp_init() - initialize omap4 opp table
  */
-static int __init omap4_opp_init(void)
+int __init omap4_opp_init(void)
 {
        int r = -ENODEV;