From 75b5a3de3d651788114473e6cf44a99b180e91b4 Mon Sep 17 00:00:00 2001 From: Rajendra Nayak Date: Wed, 15 Apr 2009 18:25:45 +0530 Subject: [PATCH] OMAP3: SR: Remove redundant defines 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 Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/smartreflex.c | 8 ++++---- arch/arm/mach-omap2/smartreflex.h | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c index 4ed34a127fa..1cae940fdbb 100644 --- a/arch/arm/mach-omap2/smartreflex.c +++ b/arch/arm/mach-omap2/smartreflex.c @@ -676,7 +676,7 @@ int sr_voltagescale_vcbypass(u32 target_opp, u8 vsel) 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, @@ -685,7 +685,7 @@ int sr_voltagescale_vcbypass(u32 target_opp, u8 vsel) 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, @@ -724,9 +724,9 @@ int sr_voltagescale_vcbypass(u32 target_opp, u8 vsel) 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); } diff --git a/arch/arm/mach-omap2/smartreflex.h b/arch/arm/mach-omap2/smartreflex.h index be6e6b9ec06..1a3f9fdae76 100644 --- a/arch/arm/mach-omap2/smartreflex.h +++ b/arch/arm/mach-omap2/smartreflex.h @@ -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 /* -- 2.11.4.GIT