lkml.org 
[lkml]   [2012]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V3 05/10] ARM: OMAP2+: SmartReflex: introduce a busy loop condition test macro
    Date
    From: Jean Pihet <j-pihet@ti.com>

    Now that omap_test_timeout is only accessible from mach-omap2/,
    introduce a similar function for SR.

    This change makes the SmartReflex implementation ready for the move
    to drivers/.

    Signed-off-by: Jean Pihet <j-pihet@ti.com>
    Signed-off-by: J Keerthy <j-keerthy@ti.com>
    ---
    arch/arm/mach-omap2/smartreflex.c | 12 ++++++------
    include/linux/power/smartreflex.h | 23 ++++++++++++++++++++++-
    2 files changed, 28 insertions(+), 7 deletions(-)

    diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
    index d859277..acef08d 100644
    --- a/arch/arm/mach-omap2/smartreflex.c
    +++ b/arch/arm/mach-omap2/smartreflex.c
    @@ -289,9 +289,9 @@ static void sr_v1_disable(struct omap_sr *sr)
    * Wait for SR to be disabled.
    * wait until ERRCONFIG.MCUDISACKINTST = 1. Typical latency is 1us.
    */
    - omap_test_timeout((sr_read_reg(sr, ERRCONFIG_V1) &
    - ERRCONFIG_MCUDISACKINTST), SR_DISABLE_TIMEOUT,
    - timeout);
    + sr_test_cond_timeout((sr_read_reg(sr, ERRCONFIG_V1) &
    + ERRCONFIG_MCUDISACKINTST), SR_DISABLE_TIMEOUT,
    + timeout);

    if (timeout >= SR_DISABLE_TIMEOUT)
    dev_warn(&sr->pdev->dev, "%s: Smartreflex disable timedout\n",
    @@ -334,9 +334,9 @@ static void sr_v2_disable(struct omap_sr *sr)
    * Wait for SR to be disabled.
    * wait until IRQSTATUS.MCUDISACKINTST = 1. Typical latency is 1us.
    */
    - omap_test_timeout((sr_read_reg(sr, IRQSTATUS) &
    - IRQSTATUS_MCUDISABLEACKINT), SR_DISABLE_TIMEOUT,
    - timeout);
    + sr_test_cond_timeout((sr_read_reg(sr, IRQSTATUS) &
    + IRQSTATUS_MCUDISABLEACKINT), SR_DISABLE_TIMEOUT,
    + timeout);

    if (timeout >= SR_DISABLE_TIMEOUT)
    dev_warn(&sr->pdev->dev, "%s: Smartreflex disable timedout\n",
    diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
    index 884eaee..78b795e 100644
    --- a/include/linux/power/smartreflex.h
    +++ b/include/linux/power/smartreflex.h
    @@ -22,7 +22,7 @@

    #include <linux/types.h>
    #include <linux/platform_device.h>
    -
    +#include <linux/delay.h>
    #include <plat/voltage.h>

    /*
    @@ -168,6 +168,27 @@ struct omap_sr {
    };

    /**
    + * test_cond_timeout - busy-loop, testing a condition
    + * @cond: condition to test until it evaluates to true
    + * @timeout: maximum number of microseconds in the timeout
    + * @index: loop index (integer)
    + *
    + * Loop waiting for @cond to become true or until at least @timeout
    + * microseconds have passed. To use, define some integer @index in the
    + * calling code. After running, if @index == @timeout, then the loop has
    + * timed out.
    + *
    + * Copied from omap_test_timeout */
    +#define sr_test_cond_timeout(cond, timeout, index) \
    +({ \
    + for (index = 0; index < timeout; index++) { \
    + if (cond) \
    + break; \
    + udelay(1); \
    + } \
    +})
    +
    +/**
    * struct omap_sr_pmic_data - Strucutre to be populated by pmic code to pass
    * pmic specific info to smartreflex driver
    *
    --
    1.7.5.4


    \
     
     \ /
      Last update: 2012-04-26 19:51    [W:4.200 / U:0.408 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site