Abhilash K V <[email protected]> writes:

> In case of AM3517 & AM3505, SmartReflex is not applicable so
> we must not enable it. 

This part is fine, but...

> So omap3_twl_init() is now not called when the processor does not
> support SR.

...I don't think this is right.  DVFS using the PMIC is still doable
without SR.

Are you assuming that no DVFS is done on these devices?

Kevin


> Signed-off-by: Vaibhav Hiremath <[email protected]>
> Signed-off-by: Abhilash K V <[email protected]>
> ---
>  arch/arm/mach-omap2/id.c              |    2 +-
>  arch/arm/mach-omap2/pm.c              |    3 ++-
>  arch/arm/plat-omap/include/plat/cpu.h |    2 ++
>  3 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
> index d27daf9..b7e3082 100644
> --- a/arch/arm/mach-omap2/id.c
> +++ b/arch/arm/mach-omap2/id.c
> @@ -188,7 +188,7 @@ static void __init omap3_check_features(void)
>       if (cpu_is_omap3630())
>               omap_features |= OMAP3_HAS_192MHZ_CLK;
>       if (!cpu_is_omap3505() && !cpu_is_omap3517())
> -             omap_features |= OMAP3_HAS_IO_WAKEUP;
> +             omap_features |= (OMAP3_HAS_IO_WAKEUP | OMAP3_HAS_SR);
>  
>       omap_features |= OMAP3_HAS_SDRC;
>  
> diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
> index d34fc52..da71abc 100644
> --- a/arch/arm/mach-omap2/pm.c
> +++ b/arch/arm/mach-omap2/pm.c
> @@ -252,7 +252,8 @@ postcore_initcall(omap2_common_pm_init);
>  static int __init omap2_common_pm_late_init(void)
>  {
>       /* Init the OMAP TWL parameters */
> -     omap3_twl_init();
> +     if (omap3_has_sr())
> +             omap3_twl_init();
>       omap4_twl_init();
>  
>       /* Init the voltage layer */
> diff --git a/arch/arm/plat-omap/include/plat/cpu.h 
> b/arch/arm/plat-omap/include/plat/cpu.h
> index 2f90269..cc6fcd3 100644
> --- a/arch/arm/plat-omap/include/plat/cpu.h
> +++ b/arch/arm/plat-omap/include/plat/cpu.h
> @@ -413,6 +413,7 @@ extern u32 omap_features;
>  #define OMAP4_HAS_MPU_1GHZ           BIT(8)
>  #define OMAP4_HAS_MPU_1_2GHZ         BIT(9)
>  #define OMAP4_HAS_MPU_1_5GHZ         BIT(10)
> +#define OMAP3_HAS_SR                 BIT(11)
>  
>  
>  #define OMAP3_HAS_FEATURE(feat,flag)                 \
> @@ -429,6 +430,7 @@ OMAP3_HAS_FEATURE(isp, ISP)
>  OMAP3_HAS_FEATURE(192mhz_clk, 192MHZ_CLK)
>  OMAP3_HAS_FEATURE(io_wakeup, IO_WAKEUP)
>  OMAP3_HAS_FEATURE(sdrc, SDRC)
> +OMAP3_HAS_FEATURE(sr, SR)
>  
>  /*
>   * Runtime detection of OMAP4 features
--
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

Reply via email to