refreshing vpforce patches

diff --git a/kernel-power-2.6.28/debian/patches/voltage_scaling_0.diff b/kernel-power-2.6.28/debian/patches/voltage_scaling_0.diff
index e5ede12..a16b238 100644 (file)
--- a/kernel-power-2.6.28/debian/patches/voltage_scaling_0.diff
+++ b/kernel-power-2.6.28/debian/patches/voltage_scaling_0.diff
@@ -18,10 +18,10 @@ Signed-off-by: Thara Gopinath <thara@ti.com>
 Signed-off-by: Leed Aguilar <leed.aguilar@ti.com>
 ---
 
-Index: kernel-2.6.28-patched/arch/arm/mach-omap2/pm34xx.c
+Index: kernel-2.6.28/arch/arm/mach-omap2/pm34xx.c
 ===================================================================
---- kernel-2.6.28-patched.orig/arch/arm/mach-omap2/pm34xx.c
-+++ kernel-2.6.28-patched/arch/arm/mach-omap2/pm34xx.c
+--- kernel-2.6.28.orig/arch/arm/mach-omap2/pm34xx.c
++++ kernel-2.6.28/arch/arm/mach-omap2/pm34xx.c
 @@ -1330,6 +1330,10 @@ static int voltagescale_vpforceupdate(u3
                                ((target_opp_no < VDD1_OPP3)
                                ? PRM_VP1_CONFIG_ERRORGAIN_OPPLOW

diff --git a/kernel-power-2.6.28/debian/patches/voltage_scaling_1.diff b/kernel-power-2.6.28/debian/patches/voltage_scaling_1.diff
index 633836c..363b093 100644 (file)
--- a/kernel-power-2.6.28/debian/patches/voltage_scaling_1.diff
+++ b/kernel-power-2.6.28/debian/patches/voltage_scaling_1.diff
@@ -15,20 +15,20 @@ Signed-off-by: Thara Gopinath <thara@ti.com>
 Signed-off-by: Leed Aguilar <leed.aguilar@ti.com>
 ---
 
-diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
-index 97b61ca..be1092c 100644
---- a/arch/arm/mach-omap2/pm34xx.c
-+++ b/arch/arm/mach-omap2/pm34xx.c
-@@ -66,6 +66,8 @@ static int regset_save_on_suspend;
- #define OMAP343X_TABLE_VALUE_OFFSET      0x30
- #define OMAP343X_CONTROL_REG_VALUE_OFFSET  0x32
+Index: kernel-2.6.28/arch/arm/mach-omap2/pm34xx.c
+===================================================================
+--- kernel-2.6.28.orig/arch/arm/mach-omap2/pm34xx.c
++++ kernel-2.6.28/arch/arm/mach-omap2/pm34xx.c
+@@ -113,6 +113,8 @@ static int ssi_pads_saved;
+ /* Interrupt controller control register offset */
+ #define INTC_CONTROL  0x48
  
 +#define VP_TRANXDONE_TIMEOUT  62
 +
  struct power_state {
        struct powerdomain *pwrdm;
        u32 next_state;
-@@ -1308,6 +1308,123 @@ int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state)
+@@ -1305,6 +1307,123 @@ int omap3_pm_set_suspend_state(struct po
        return -EINVAL;
  }
  
@@ -151,12 +151,13 @@ index 97b61ca..be1092c 100644
 +
  void omap3_set_prm_setup_times(struct prm_setup_times *setup_times)
  {
-       prm_setup.clksetup = setup_vc->clksetup;
-diff --git a/arch/arm/mach-omap2/resource34xx.c b/arch/arm/mach-omap2/resource34xx.c
-index 68616f0..7beaa8b 100644
---- a/arch/arm/mach-omap2/resource34xx.c
-+++ b/arch/arm/mach-omap2/resource34xx.c
-@@ -288,9 +288,9 @@ static int program_opp(int res, struct omap_opp *opp, int target_level,
+       prm_setup.clksetup = setup_times->clksetup;
+Index: kernel-2.6.28/arch/arm/mach-omap2/resource34xx.c
+===================================================================
+--- kernel-2.6.28.orig/arch/arm/mach-omap2/resource34xx.c
++++ kernel-2.6.28/arch/arm/mach-omap2/resource34xx.c
+@@ -287,7 +287,7 @@ static int program_opp(int res, struct o
+                                       current_level);
  #ifdef CONFIG_OMAP_SMARTREFLEX
                else
 -                      sr_voltagescale_vcbypass(t_opp, c_opp,
@@ -164,27 +165,26 @@ index 68616f0..7beaa8b 100644
                                opp[target_level].vsel,
                                opp[current_level].vsel);
  #endif
-       }
- #ifdef CONFIG_OMAP_SMARTREFLEX
-       if (sr_status)
-diff --git a/arch/arm/mach-omap2/resource34xx.h b/arch/arm/mach-omap2/resource34xx.h
-index 5b5618a..f5c0636 100644
---- a/arch/arm/mach-omap2/resource34xx.h
-+++ b/arch/arm/mach-omap2/resource34xx.h
-@@ -31,5 +31,5 @@
+Index: kernel-2.6.28/arch/arm/mach-omap2/resource34xx.h
+===================================================================
+--- kernel-2.6.28.orig/arch/arm/mach-omap2/resource34xx.h
++++ kernel-2.6.28/arch/arm/mach-omap2/resource34xx.h
+@@ -28,7 +28,7 @@
  #include <mach/omap-pm.h>
  #include "resource34xx_mutex.h"
  
 -extern int sr_voltagescale_vcbypass(u32 t_opp, u32 c_opp, u8 t_vsel, u8 c_vsel);
 +extern int omap_scale_voltage(u32 t_opp, u32 c_opp, u8 t_vsel, u8 c_vsel);
  
-diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
-index 8918e8f..7737890 100644
---- a/arch/arm/plat-omap/Kconfig
-+++ b/arch/arm/plat-omap/Kconfig
-@@ -402,6 +402,16 @@ config OMAP3_MPU_L2_CACHE_WORKAROUND
-         instruction a system hang or reset via watchdog occurs.  OFF
-         mode is still safe to use.
+ /*
+  * mpu_latency/core_latency are used to control the cpuidle C state.
+Index: kernel-2.6.28/arch/arm/plat-omap/Kconfig
+===================================================================
+--- kernel-2.6.28.orig/arch/arm/plat-omap/Kconfig
++++ kernel-2.6.28/arch/arm/plat-omap/Kconfig
+@@ -299,6 +299,16 @@ config OMAP_PM_SRF
+ 
+ endchoice
  
 +config VOLTSCALE_VPFORCE
 +      bool "Voltage scaling using VP force update method"