Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e953255 authored by Guo Zeng's avatar Guo Zeng Committed by Linus Torvalds
Browse files

drivers/rtc/rtc-sirfsoc.c: move hardware initilization earlier in probe 



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: default avatarGuo Zeng <guo.zeng@csr.com>
Signed-off-by: default avatarBarry Song <Baohua.Song@csr.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a682e9c2

drivers/rtc/rtc-sirfsoc.c

+8 −8
Original line number Diff line number Diff line
@@ -286,14 +286,6 @@ static int sirfsoc_rtc_probe(struct platform_device *pdev) 
	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 platform_device *pdev) 
	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,