* [PATCH 07/07] OMAP3: SR: Remove redundunt defines
@ 2009-03-20 12:32 Nayak, Rajendra
0 siblings, 0 replies; only message in thread
From: Nayak, Rajendra @ 2009-03-20 12:32 UTC (permalink / raw)
To: linux-omap; +Cc: Nayak, Rajendra
From: Rajendra Nayak <rnayak@ti.com>
This patch removes the local defines (PRCM_VDD1/2) in smartreflex
driver and uses the already existing global definitions (VDD1_OPP/VDD2_OPP)
from omap34xx.h file.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
---
arch/arm/mach-omap2/resource34xx.c | 6 +++---
arch/arm/mach-omap2/smartreflex.c | 8 ++++----
arch/arm/mach-omap2/smartreflex.h | 3 ---
3 files changed, 7 insertions(+), 10 deletions(-)
Index: linux-omap-pm/arch/arm/mach-omap2/resource34xx.c
===================================================================
--- linux-omap-pm.orig/arch/arm/mach-omap2/resource34xx.c 2009-03-20 13:55:09.000000000 +0530
+++ linux-omap-pm/arch/arm/mach-omap2/resource34xx.c 2009-03-20 13:59:44.428833944 +0530
@@ -217,7 +217,7 @@ int resource_set_opp_level(int res, u32
/* Send pre notification to CPUFreq */
cpufreq_notify_transition(&freqs_notify, CPUFREQ_PRECHANGE);
#endif
- t_opp = ID_VDD(PRCM_VDD1) |
+ t_opp = ID_VDD(VDD1_OPP) |
ID_OPP_NO(mpu_opps[target_level].opp_id);
/* For VDD1 OPP3 and above, make sure the interconnect
@@ -257,7 +257,7 @@ int resource_set_opp_level(int res, u32
return 0;
l3_freq = get_freq(l3_opps + MAX_VDD2_OPP,
target_level);
- t_opp = ID_VDD(PRCM_VDD2) |
+ t_opp = ID_VDD(VDD2_OPP) |
ID_OPP_NO(l3_opps[target_level].opp_id);
if (resp->curr_level > target_level) {
/* Scale Frequency and then voltage */
@@ -278,7 +278,7 @@ int resource_set_opp_level(int res, u32
if (ret) {
#ifdef CONFIG_OMAP_SMARTREFLEX
/* Setting clock failed, revert voltage */
- t_opp = ID_VDD(PRCM_VDD2) |
+ t_opp = ID_VDD(VDD2_OPP) |
ID_OPP_NO(l3_opps[resp->curr_level].
opp_id);
sr_voltagescale_vcbypass(t_opp,
Index: linux-omap-pm/arch/arm/mach-omap2/smartreflex.c
===================================================================
--- linux-omap-pm.orig/arch/arm/mach-omap2/smartreflex.c 2009-03-20 11:28:38.000000000 +0530
+++ linux-omap-pm/arch/arm/mach-omap2/smartreflex.c 2009-03-20 13:58:52.277014282 +0530
@@ -674,7 +674,7 @@ int sr_voltagescale_vcbypass(u32 target_
vdd = get_vdd(target_opp);
target_opp_no = get_opp_no(target_opp);
- if (vdd == PRCM_VDD1) {
+ if (vdd == VDD1_OPP) {
sr_status = sr_stop_vddautocomap(SR1);
prm_rmw_mod_reg_bits(OMAP3430_VC_CMD_ON_MASK,
@@ -683,7 +683,7 @@ int sr_voltagescale_vcbypass(u32 target_
OMAP3_PRM_VC_CMD_VAL_0_OFFSET);
reg_addr = R_VDD1_SR_CONTROL;
- } else if (vdd == PRCM_VDD2) {
+ } else if (vdd == VDD2_OPP) {
sr_status = sr_stop_vddautocomap(SR2);
prm_rmw_mod_reg_bits(OMAP3430_VC_CMD_ON_MASK,
@@ -722,9 +722,9 @@ int sr_voltagescale_vcbypass(u32 target_
udelay(T2_SMPS_UPDATE_DELAY);
if (sr_status) {
- if (vdd == PRCM_VDD1)
+ if (vdd == VDD1_OPP)
sr_start_vddautocomap(SR1, target_opp_no);
- else if (vdd == PRCM_VDD2)
+ else if (vdd == VDD2_OPP)
sr_start_vddautocomap(SR2, target_opp_no);
}
Index: linux-omap-pm/arch/arm/mach-omap2/smartreflex.h
===================================================================
--- linux-omap-pm.orig/arch/arm/mach-omap2/smartreflex.h 2009-03-19 23:49:17.000000000 +0530
+++ linux-omap-pm/arch/arm/mach-omap2/smartreflex.h 2009-03-20 13:58:23.097672443 +0530
@@ -171,9 +171,6 @@
/* R_DCDC_GLOBAL_CFG register, SMARTREFLEX_ENABLE values */
#define DCDC_GLOBAL_CFG_ENABLE_SRFLX 0x08
-/* VDDs*/
-#define PRCM_VDD1 1
-#define PRCM_VDD2 2
#define PRCM_MAX_SYSC_REGS 30
/*
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-03-20 12:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-20 12:32 [PATCH 07/07] OMAP3: SR: Remove redundunt defines Nayak, Rajendra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).