lkml.org 
[lkml]   [2015]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 001/150] drivers/rtc/rtc-sirfsoc.c: move hardware initilization earlier in probe
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Guo Zeng <guo.zeng@csr.com>

    commit 0e95325525c4383565cea4f402f15a3113162d05 upstream.

    Move rtc register to be later than hardware initialization. The reason
    is that devm_rtc_device_register() will do read_time() which is a
    callback accessing hardware. This sometimes causes a hang in the
    hardware related callback.

    Signed-off-by: Guo Zeng <guo.zeng@csr.com>
    Signed-off-by: Barry Song <Baohua.Song@csr.com>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/rtc/rtc-sirfsoc.c | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    --- a/drivers/rtc/rtc-sirfsoc.c
    +++ b/drivers/rtc/rtc-sirfsoc.c
    @@ -286,14 +286,6 @@ static int sirfsoc_rtc_probe(struct plat
    rtc_div = ((32768 / RTC_HZ) / 2) - 1;
    sirfsoc_rtc_iobrg_writel(rtc_div, rtcdrv->rtc_base + RTC_DIV);

    - rtcdrv->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
    - &sirfsoc_rtc_ops, THIS_MODULE);
    - if (IS_ERR(rtcdrv->rtc)) {
    - err = PTR_ERR(rtcdrv->rtc);
    - dev_err(&pdev->dev, "can't register RTC device\n");
    - return err;
    - }
    -
    /* 0x3 -> RTC_CLK */
    sirfsoc_rtc_iobrg_writel(SIRFSOC_RTC_CLK,
    rtcdrv->rtc_base + RTC_CLOCK_SWITCH);
    @@ -308,6 +300,14 @@ static int sirfsoc_rtc_probe(struct plat
    rtcdrv->overflow_rtc =
    sirfsoc_rtc_iobrg_readl(rtcdrv->rtc_base + RTC_SW_VALUE);

    + rtcdrv->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
    + &sirfsoc_rtc_ops, THIS_MODULE);
    + if (IS_ERR(rtcdrv->rtc)) {
    + err = PTR_ERR(rtcdrv->rtc);
    + dev_err(&pdev->dev, "can't register RTC device\n");
    + return err;
    + }
    +
    rtcdrv->irq = platform_get_irq(pdev, 0);
    err = devm_request_irq(
    &pdev->dev,



    \
     
     \ /
      Last update: 2015-01-14 08:41    [W:4.081 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site