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

Commit 4390ce00 authored by Johan Hovold's avatar Johan Hovold Committed by Linus Torvalds
Browse files

rtc: omap: fix class-device registration 



Make sure not to register the class device until after the device has
been configured.

Currently, the device is not fully configured (e.g. 24-hour mode) when
the class device is registered, something which involves driver
callbacks for example to read the current time.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Benot Cousson <bcousson@baylibre.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Tero Kristo <t-kristo@ti.com>
Cc: Keerthy J <j-keerthy@ti.com>
Tested-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 437b37a6

drivers/rtc/rtc-omap.c

+23 −23
Original line number Diff line number Diff line
@@ -413,16 +413,6 @@ static int __init omap_rtc_probe(struct platform_device *pdev) 
		rtc_writel(KICK1_VALUE, OMAP_RTC_KICK1_REG);

	}



	device_init_wakeup(&pdev->dev, true);



	rtc = devm_rtc_device_register(&pdev->dev, pdev->name,

			&omap_rtc_ops, THIS_MODULE);

	if (IS_ERR(rtc)) {

		ret = PTR_ERR(rtc);

		goto err;

	}

	platform_set_drvdata(pdev, rtc);



	/*

	 * disable interrupts

	 *
@@ -446,19 +436,6 @@ static int __init omap_rtc_probe(struct platform_device *pdev) 
	if (reg & (u8) OMAP_RTC_STATUS_ALARM)

		rtc_write(OMAP_RTC_STATUS_ALARM, OMAP_RTC_STATUS_REG);



	/* handle periodic and alarm irqs */

	ret = devm_request_irq(&pdev->dev, omap_rtc_timer, rtc_irq, 0,

			dev_name(&rtc->dev), rtc);

	if (ret)

		goto err;



	if (omap_rtc_timer != omap_rtc_alarm) {

		ret = devm_request_irq(&pdev->dev, omap_rtc_alarm, rtc_irq, 0,

				dev_name(&rtc->dev), rtc);

		if (ret)

			goto err;

	}



	/* On boards with split power, RTC_ON_NOFF won't reset the RTC */

	reg = rtc_read(OMAP_RTC_CTRL_REG);

	if (reg & (u8) OMAP_RTC_CTRL_STOP)
@@ -488,6 +465,29 @@ static int __init omap_rtc_probe(struct platform_device *pdev) 
	if (reg != new_ctrl)

		rtc_write(new_ctrl, OMAP_RTC_CTRL_REG);



	device_init_wakeup(&pdev->dev, true);



	rtc = devm_rtc_device_register(&pdev->dev, pdev->name,

			&omap_rtc_ops, THIS_MODULE);

	if (IS_ERR(rtc)) {

		ret = PTR_ERR(rtc);

		goto err;

	}

	platform_set_drvdata(pdev, rtc);



	/* handle periodic and alarm irqs */

	ret = devm_request_irq(&pdev->dev, omap_rtc_timer, rtc_irq, 0,

			dev_name(&rtc->dev), rtc);

	if (ret)

		goto err;



	if (omap_rtc_timer != omap_rtc_alarm) {

		ret = devm_request_irq(&pdev->dev, omap_rtc_alarm, rtc_irq, 0,

				dev_name(&rtc->dev), rtc);

		if (ret)

			goto err;

	}



	return 0;



err: