Support OMAP3 VC adaptation with different Power IC
Subsystems (3)
PATCH 1/2 Support OMAP3 VC adaptation with different Power IC
Quoted 1 line
From
c1aba8ba7af3ddd16346d95795bda71e65baa4d0Mon Sep 17 00:00:00 2001
From: Chunqiu Wang <[email protected]>
Date: Wed, 24 Jun 2009 06:48:52 +0800
Subject: [PATCH] Support OMAP3 VC adaptation with different Power IC
Current OMAP SmartReflex driver only supports TI Triton Power IC, add a callback to make it possible to use different PowerIC and use different settings to configure OMAP3 Voltage Controller for DVFS
Board file can setup a new function to have different settings on SR to configure their Power IC for voltage scaling
--- arch/arm/mach-omap2/smartreflex.c | 13 +++++++++++++ arch/arm/mach-omap2/smartreflex.h | 4 ++++ arch/arm/plat-omap/Kconfig | 2 +- 3 files changed, 18 insertions(+), 1 deletions(-)
(quoted diff) +0 -0
b/arch/arm/mach-omap2/smartreflex.c
index 9d462e3..bacf602 100644
arch/arm/mach-omap2/smartreflex.c +7 -0
@@ -52,6 +52,8 @@ struct omap_sr {#define SR_REGADDR (offs) (sr->srbase_addr + offset) +static omap3_voltagescale_vcbypass_t omap3_volscale_vcbypass_fun; +static inline void sr_write_reg (struct omap_sr *sr,unsigned offset,u32 value) {__raw_writel (value,SR_REGADDR (offset));
@@ -767,6 +769,11 @@ void disable_smartreflex(int srid) } } +void omap3_voltagescale_vcbypass_setup (omap3_voltagescale_vcbypass_t fun) +{ + omap3_volscale_vcbypass_fun = fun; +} +/* Voltage Scaling using SR VCBYPASS */ int sr_voltagescale_vcbypass (u32 target_opp,u32 current_opp,u8 target_vsel,u8 current_vsel)
@@ -779,6 +786,10 @@ int sr_voltagescale_vcbypass(u32 target_opp, u32
current_opp,
u32 t2_smps_steps = 0;
u32 t2_smps_delay = 0;
+ if (omap3_volscale_vcbypass_fun)
+ return omap3_volscale_vcbypass_fun(target_opp, current_opp,
+ target_vsel, current_vsel);
+
vdd = get_vdd(target_opp);
target_opp_no = get_opp_no(target_opp); current_opp_no = get_opp_no(current_opp);
@@ -940,6 +951,7 @@ static int __init omap3_sr_init(void)
return -ENODEV;
}+#ifdef CONFIG_TWL4030_CORE
/* Enable SR on T2 */
ret = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &RdReg,
R_DCDC_GLOBAL_CFG);
@@ -947,6 +959,7 @@ static int __init omap3_sr_init(void)
RdReg |= DCDC_GLOBAL_CFG_ENABLE_SRFLX;
ret |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, RdReg,
R_DCDC_GLOBAL_CFG);
+#endif
if (cpu_is_omap34xx()) {
sr1.clk = clk_get(NULL, "sr1_fck");
(quoted diff) +0 -0
b/arch/arm/mach-omap2/smartreflex.h
index 2a0e823..c4aca9d 100644
arch/arm/mach-omap2/smartreflex.h +4 -0
@@ -248,9 +248,13 @@ void disable_smartreflex(int srid);int sr_voltagescale_vcbypass (u32 t_opp,u32 c_opp,u8 t_vsel,u8 c_vsel);void sr_start_vddautocomap (int srid,u32 target_opp_no);int sr_stop_vddautocomap (int srid); +typedef int (*omap3_voltagescale_vcbypass_t )(u32 t_opp,u32 c_opp, +u8 t_vsel,u8 c_vsel); +void omap3_voltagescale_vcbypass_setup (omap3_voltagescale_vcbypass_t fun);#else static inline void enable_smartreflex (int srid) {}static inline void disable_smartreflex (int srid) {} +#define omap3_voltagescale_vcbypass_setup (fun) do {} while (0);#endif #endif
arch/arm/plat-omap/Kconfig +1 -1
@@ -68,7 +68,7 @@ config OMAP_DEBUG_CLOCKDOMAIN config OMAP_SMARTREFLEX bool "SmartReflex support" - depends on ARCH_OMAP34XX && TWL4030_CORE && PM + depends on ARCH_OMAP34XX && PM help Say Y if you want to enable SmartReflex.
Signature · 1 line
1.5.4.3
Quoted 10 lines · sawsd wang
From
c1aba8ba7af3ddd16346d95795bda71e65baa4d0Mon Sep 17 00:00:00 2001
From: Chunqiu Wang <[email protected]>
Date: Wed, 24 Jun 2009 06:48:52 +0800
Subject: [PATCH] Support OMAP3 VC adaptation with different Power ICCurrent OMAP SmartReflex driver only supports TI Triton Power IC, add a callback to make it possible to use different PowerIC and use different settings to configure OMAP3 Voltage Controller for DVFS
Quoted 4 lines
Board file can setup a new function to have different settings on SR to configure their Power IC for voltage scaling
Signed-off-by Chunqiu Wang <[email protected]>
Patch is still line-wrapped in at least one place, and patch 2/2 is wrapped in several.
Based on format and the headers, it doesn't look to me like you're using git-send-email. Really, git-send-email will make your life much simpler.
Feel free to send me some test patches off-list so we can figure out your mailer problems.
Kevin
Quoted 98 lines
--- arch/arm/mach-omap2/smartreflex.c | 13 +++++++++++++ arch/arm/mach-omap2/smartreflex.h | 4 ++++ arch/arm/plat-omap/Kconfig | 2 +- 3 files changed, 18 insertions(+), 1 deletions(-)arch/arm/mach-omap2/smartreflex.c +11
-0@@ -52,6 +52,8 @@ struct omap_sr {#define SR_REGADDR (offs) (sr->srbase_addr + offset) +static omap3_voltagescale_vcbypass_t omap3_volscale_vcbypass_fun; +static inline void sr_write_reg (struct omap_sr *sr,unsigned offset,u32 value) {__raw_writel (value,SR_REGADDR (offset));@@ -767,6 +769,11 @@ void disable_smartreflex(int srid) } } +void omap3_voltagescale_vcbypass_setup (omap3_voltagescale_vcbypass_t fun) +{ + omap3_volscale_vcbypass_fun = fun; +} +/* Voltage Scaling using SR VCBYPASS */ int sr_voltagescale_vcbypass (u32 target_opp,u32 current_opp,u8 target_vsel,u8 current_vsel)@@ -779,6 +786,10 @@ int sr_voltagescale_vcbypass(u32 target_opp, u32 current_opp, u32 t2_smps_steps = 0;u32 t2_smps_delay =0 ; +if (omap3_volscale_vcbypass_fun) +return omap3_volscale_vcbypass_fun (target_opp, current_opp, + target_vsel, current_vsel); + vdd =get_vdd (target_opp); target_opp_no =get_opp_no (target_opp);arch/arm/mach-omap2/smartreflex.c +2
-0current_opp_no =get_opp_no (current_opp);@@ -940,6 +951,7 @@ static int __init omap3_sr_init(void)return -ENODEV ; } +#ifdef CONFIG_TWL4030_CORE /* Enable SR on T2 */ ret =twl4030_i2c_read_u8 (TWL4030_MODULE_PM_RECEIVER , &RdReg,R_DCDC_GLOBAL_CFG );@@ -947,6 +959,7 @@ static int __init omap3_sr_init(void) RdReg |=DCDC_GLOBAL_CFG_ENABLE_SRFLX ; ret |=twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER , RdReg,R_DCDC_GLOBAL_CFG ); +#endif if (cpu_is_omap34xx ()) { sr1.clk =clk_get (NULL ,"sr1_fck" );arch/arm/mach-omap2/smartreflex.h +4
-0@@ -248,9 +248,13 @@ void disable_smartreflex(int srid);int sr_voltagescale_vcbypass (u32 t_opp,u32 c_opp,u8 t_vsel,u8 c_vsel);void sr_start_vddautocomap (int srid,u32 target_opp_no);int sr_stop_vddautocomap (int srid); +typedef int (*omap3_voltagescale_vcbypass_t )(u32 t_opp,u32 c_opp, +u8 t_vsel,u8 c_vsel); +void omap3_voltagescale_vcbypass_setup (omap3_voltagescale_vcbypass_t fun);#else static inline void enable_smartreflex (int srid) {}static inline void disable_smartreflex (int srid) {} +#define omap3_voltagescale_vcbypass_setup (fun) do {} while (0);#endif #endif arch/arm/plat-omap/Kconfig +1
-1@@ -68,7 +68,7 @@ config OMAP_DEBUG_CLOCKDOMAIN config OMAP_SMARTREFLEX bool "SmartReflex support" - depends on ARCH_OMAP34XX && TWL4030_CORE && PM + depends on ARCH_OMAP34XX && PM help Say Y if you want to enable SmartReflex.Signature · 5 lines
1.5.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 10 lines · sawsd wang
From
c1aba8ba7af3ddd16346d95795bda71e65baa4d0Mon Sep 17 00:00:00 2001
From: Chunqiu Wang <[email protected]>
Date: Wed, 24 Jun 2009 06:48:52 +0800
Subject: [PATCH] Support OMAP3 VC adaptation with different Power ICCurrent OMAP SmartReflex driver only supports TI Triton Power IC, add a callback to make it possible to use different PowerIC and use different settings to configure OMAP3 Voltage Controller for DVFS
Quoted 4 lines
Board file can setup a new function to have different settings on SR to configure their Power IC for voltage scaling
Signed-off-by Chunqiu Wang <[email protected]>
Are there any plans to update this patch to fix line-wrapping and patch apply issues?
If not, I will drop it from my incoming queue.
Kevin
Quoted 98 lines
--- arch/arm/mach-omap2/smartreflex.c | 13 +++++++++++++ arch/arm/mach-omap2/smartreflex.h | 4 ++++ arch/arm/plat-omap/Kconfig | 2 +- 3 files changed, 18 insertions(+), 1 deletions(-)arch/arm/mach-omap2/smartreflex.c +11
-0@@ -52,6 +52,8 @@ struct omap_sr {#define SR_REGADDR (offs) (sr->srbase_addr + offset) +static omap3_voltagescale_vcbypass_t omap3_volscale_vcbypass_fun; +static inline void sr_write_reg (struct omap_sr *sr,unsigned offset,u32 value) {__raw_writel (value,SR_REGADDR (offset));@@ -767,6 +769,11 @@ void disable_smartreflex(int srid) } } +void omap3_voltagescale_vcbypass_setup (omap3_voltagescale_vcbypass_t fun) +{ + omap3_volscale_vcbypass_fun = fun; +} +/* Voltage Scaling using SR VCBYPASS */ int sr_voltagescale_vcbypass (u32 target_opp,u32 current_opp,u8 target_vsel,u8 current_vsel)@@ -779,6 +786,10 @@ int sr_voltagescale_vcbypass(u32 target_opp, u32 current_opp, u32 t2_smps_steps = 0;u32 t2_smps_delay =0 ; +if (omap3_volscale_vcbypass_fun) +return omap3_volscale_vcbypass_fun (target_opp, current_opp, + target_vsel, current_vsel); + vdd =get_vdd (target_opp); target_opp_no =get_opp_no (target_opp);arch/arm/mach-omap2/smartreflex.c +2
-0current_opp_no =get_opp_no (current_opp);@@ -940,6 +951,7 @@ static int __init omap3_sr_init(void)return -ENODEV ; } +#ifdef CONFIG_TWL4030_CORE /* Enable SR on T2 */ ret =twl4030_i2c_read_u8 (TWL4030_MODULE_PM_RECEIVER , &RdReg,R_DCDC_GLOBAL_CFG );@@ -947,6 +959,7 @@ static int __init omap3_sr_init(void) RdReg |=DCDC_GLOBAL_CFG_ENABLE_SRFLX ; ret |=twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER , RdReg,R_DCDC_GLOBAL_CFG ); +#endif if (cpu_is_omap34xx ()) { sr1.clk =clk_get (NULL ,"sr1_fck" );arch/arm/mach-omap2/smartreflex.h +4
-0@@ -248,9 +248,13 @@ void disable_smartreflex(int srid);int sr_voltagescale_vcbypass (u32 t_opp,u32 c_opp,u8 t_vsel,u8 c_vsel);void sr_start_vddautocomap (int srid,u32 target_opp_no);int sr_stop_vddautocomap (int srid); +typedef int (*omap3_voltagescale_vcbypass_t )(u32 t_opp,u32 c_opp, +u8 t_vsel,u8 c_vsel); +void omap3_voltagescale_vcbypass_setup (omap3_voltagescale_vcbypass_t fun);#else static inline void enable_smartreflex (int srid) {}static inline void disable_smartreflex (int srid) {} +#define omap3_voltagescale_vcbypass_setup (fun) do {} while (0);#endif #endif arch/arm/plat-omap/Kconfig +1
-1@@ -68,7 +68,7 @@ config OMAP_DEBUG_CLOCKDOMAIN config OMAP_SMARTREFLEX bool "SmartReflex support" - depends on ARCH_OMAP34XX && TWL4030_CORE && PM + depends on ARCH_OMAP34XX && PM help Say Y if you want to enable SmartReflex.Signature · 5 lines
1.5.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html