lkml.org 
[lkml]   [2011]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v2 2/2] omap_twl: Prevent SR to enable for am3517/am3505 devices
    Abhilash K V a écrit :
    > From: Vaibhav Hiremath <hvaibhav@ti.com>
    >
    > In case of AM3517 & AM3505, Smart Reflex is not applicable so
    > we must not enable it. So add check for absence of SR feature
    > in omap3_twl_init() and return -ENODEV if absence, else continue.

    I believe another check should be done :
    you have the same problem if you run a omap3630 with TPS65023.

    The check should take in account the pmu that is used and if it support SR.


    Matthieu


    >
    > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
    > Signed-off-by: Abhilash K V <abhilash.kv@ti.com>
    > ---
    > arch/arm/mach-omap2/id.c | 2 +-
    > arch/arm/mach-omap2/omap_twl.c | 8 ++++++++
    > arch/arm/plat-omap/include/plat/cpu.h | 2 ++
    > 3 files changed, 11 insertions(+), 1 deletions(-)
    >
    > diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
    > index 37efb86..da71098 100644
    > --- a/arch/arm/mach-omap2/id.c
    > +++ b/arch/arm/mach-omap2/id.c
    > @@ -202,7 +202,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/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c
    > index 07d6140..47e27b5 100644
    > --- a/arch/arm/mach-omap2/omap_twl.c
    > +++ b/arch/arm/mach-omap2/omap_twl.c
    > @@ -269,6 +269,14 @@ int __init omap3_twl_init(void)
    > if (!cpu_is_omap34xx())
    > return -ENODEV;
    >
    > + /*
    > + * In case of AM3517/AM3505 we should not be going down
    > + * further, since SR is not applicable there.
    > + */
    > + if (!omap3_has_sr()) {
    > + return -ENODEV;
    > + }
    > +
    > if (cpu_is_omap3630()) {
    > omap3_mpu_volt_info.vp_vddmin = OMAP3630_VP1_VLIMITTO_VDDMIN;
    > omap3_mpu_volt_info.vp_vddmax = OMAP3630_VP1_VLIMITTO_VDDMAX;
    > diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
    > index 67b3d75..294e015 100644
    > --- a/arch/arm/plat-omap/include/plat/cpu.h
    > +++ b/arch/arm/plat-omap/include/plat/cpu.h
    > @@ -491,6 +491,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) \
    > @@ -507,6 +508,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-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-08-25 17:05    [W:0.029 / U:17.940 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site