From: Rajendra Nayak <rnayak@xxxxxx>
Currently vdd1 and vdd2 voltages are updated only after OMAP wakes up
from RET/OFF. This patch forces update according to boot OPP on boot.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Jouni Hogander <jouni.hogander@xxxxxxxxx>
---
arch/arm/mach-omap2/smartreflex.c | 81 +++++++++++++++++++++-----------------
1 files changed, 45 insertions(+), 36 deletions(-)
Index: linux-omap-pm/arch/arm/mach-omap2/smartreflex.c
===================================================================
--- linux-omap-pm.orig/arch/arm/mach-omap2/smartreflex.c
+++ linux-omap-pm/arch/arm/mach-omap2/smartreflex.c
@@ -36,10 +36,6 @@
#include "smartreflex.h"
#include "prm-regbits-34xx.h"
-/* XXX: These should be relocated where-ever the OPP implementation will be */
-u32 current_vdd1_opp;
-u32 current_vdd2_opp;
-
struct omap_sr {
int srid;
int is_sr_reset;
@@ -253,9 +249,11 @@ static void sr_configure_vp(int srid)
u32 vpconfig;
if (srid == SR1) {
- vpconfig = PRM_VP1_CONFIG_ERROROFFSET | PRM_VP1_CONFIG_ERRORGAIN
- | PRM_VP1_CONFIG_INITVOLTAGE
- | PRM_VP1_CONFIG_TIMEOUTEN;
+ vpconfig = PRM_VP1_CONFIG_ERROROFFSET |
+ PRM_VP1_CONFIG_ERRORGAIN |
+ PRM_VP1_CONFIG_TIMEOUTEN |
+ mpu_opps[omap_pm_vdd1_get_opp()].vsel <<
+ OMAP3430_INITVOLTAGE_SHIFT;
prm_write_mod_reg(vpconfig, OMAP3430_GR_MOD,
OMAP3_PRM_VP1_CONFIG_OFFSET);
@@ -277,15 +275,25 @@ static void sr_configure_vp(int srid)
/* Trigger initVDD value copy to voltage processor */
prm_set_mod_reg_bits(PRM_VP1_CONFIG_INITVDD, OMAP3430_GR_MOD,
- OMAP3_PRM_VP1_CONFIG_OFFSET);
+ OMAP3_PRM_VP1_CONFIG_OFFSET);
+
/* Clear initVDD copy trigger bit */
prm_clear_mod_reg_bits(PRM_VP1_CONFIG_INITVDD, OMAP3430_GR_MOD,
- OMAP3_PRM_VP1_CONFIG_OFFSET);
+ OMAP3_PRM_VP1_CONFIG_OFFSET);
+
+ /* Force update of voltage */
+ prm_set_mod_reg_bits(OMAP3430_FORCEUPDATE, OMAP3430_GR_MOD,
+ OMAP3_PRM_VP1_CONFIG_OFFSET);
+ /* Clear force bit */
+ prm_clear_mod_reg_bits(OMAP3430_FORCEUPDATE, OMAP3430_GR_MOD,
+ OMAP3_PRM_VP1_CONFIG_OFFSET);
} else if (srid == SR2) {
- vpconfig = PRM_VP2_CONFIG_ERROROFFSET | PRM_VP2_CONFIG_ERRORGAIN
- | PRM_VP2_CONFIG_INITVOLTAGE
- | PRM_VP2_CONFIG_TIMEOUTEN;
+ vpconfig = PRM_VP2_CONFIG_ERROROFFSET |
+ PRM_VP2_CONFIG_ERRORGAIN |
+ PRM_VP2_CONFIG_TIMEOUTEN |
+ l3_opps[omap_pm_vdd2_get_opp()].vsel <<
+ OMAP3430_INITVOLTAGE_SHIFT;
prm_write_mod_reg(vpconfig, OMAP3430_GR_MOD,
OMAP3_PRM_VP2_CONFIG_OFFSET);
@@ -306,11 +314,19 @@ static void sr_configure_vp(int srid)
OMAP3_PRM_VP2_VLIMITTO_OFFSET);
/* Trigger initVDD value copy to voltage processor */
- prm_set_mod_reg_bits(PRM_VP2_CONFIG_INITVDD, OMAP3430_GR_MOD,
- OMAP3_PRM_VP2_CONFIG_OFFSET);
- /* Reset initVDD copy trigger bit */
- prm_clear_mod_reg_bits(PRM_VP2_CONFIG_INITVDD, OMAP3430_GR_MOD,
- OMAP3_PRM_VP2_CONFIG_OFFSET);
+ prm_set_mod_reg_bits(PRM_VP1_CONFIG_INITVDD, OMAP3430_GR_MOD,
+ OMAP3_PRM_VP2_CONFIG_OFFSET);
+
+ /* Clear initVDD copy trigger bit */
+ prm_clear_mod_reg_bits(PRM_VP1_CONFIG_INITVDD, OMAP3430_GR_MOD,
+ OMAP3_PRM_VP2_CONFIG_OFFSET);
+
+ /* Force update of voltage */
+ prm_set_mod_reg_bits(OMAP3430_FORCEUPDATE, OMAP3430_GR_MOD,
+ OMAP3_PRM_VP2_CONFIG_OFFSET);
+ /* Clear force bit */
+ prm_clear_mod_reg_bits(OMAP3430_FORCEUPDATE, OMAP3430_GR_MOD,
+ OMAP3_PRM_VP2_CONFIG_OFFSET);
}
}
@@ -553,9 +569,9 @@ void enable_smartreflex(int srid)
sr_clk_enable(sr);
if (srid == SR1)
- target_opp_no = get_opp_no(current_vdd1_opp);
+ target_opp_no = omap_pm_vdd1_get_opp();
else if (srid == SR2)
- target_opp_no = get_opp_no(current_vdd2_opp);
+ target_opp_no = omap_pm_vdd2_get_opp();
sr_configure(sr);
@@ -687,7 +703,7 @@ static ssize_t omap_sr_vdd1_autocomp_sto
return -EINVAL;
}
- current_vdd1opp_no = get_opp_no(current_vdd1_opp);
+ current_vdd1opp_no = omap_pm_vdd1_get_opp();
if (value == 0)
sr_stop_vddautocomap(SR1);
@@ -725,7 +741,7 @@ static ssize_t omap_sr_vdd2_autocomp_sto
return -EINVAL;
}
- current_vdd2opp_no = get_opp_no(current_vdd2_opp);
+ current_vdd2opp_no = omap_pm_vdd2_get_opp();
if (value == 0)
sr_stop_vddautocomap(SR2);
@@ -751,13 +767,14 @@ static int __init omap3_sr_init(void)
int ret = 0;
u8 RdReg;
- if (omap_rev() > OMAP3430_REV_ES1_0) {
- current_vdd1_opp = PRCM_VDD1_OPP3;
- current_vdd2_opp = PRCM_VDD2_OPP3;
- } else {
- current_vdd1_opp = PRCM_VDD1_OPP1;
- current_vdd2_opp = PRCM_VDD1_OPP1;
- }
+ /* Enable SR on T2 */
+ ret = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &RdReg,
+ R_DCDC_GLOBAL_CFG);
+
+ RdReg |= DCDC_GLOBAL_CFG_ENABLE_SRFLX;
+ ret |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, RdReg,
+ R_DCDC_GLOBAL_CFG);
+
if (cpu_is_omap34xx()) {
sr1.clk = clk_get(NULL, "sr1_fck");
sr2.clk = clk_get(NULL, "sr2_fck");
@@ -772,14 +789,6 @@ static int __init omap3_sr_init(void)
sr_set_nvalues(&sr2);
sr_configure_vp(SR2);
- /* Enable SR on T2 */
- ret = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &RdReg,
- R_DCDC_GLOBAL_CFG);
-
- RdReg |= DCDC_GLOBAL_CFG_ENABLE_SRFLX;
- ret |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, RdReg,
- R_DCDC_GLOBAL_CFG);
-
printk(KERN_INFO "SmartReflex driver initialized\n");
ret = sysfs_create_file(power_kobj, &sr_vdd1_autocomp.attr);--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
