rtc-s3c: Fix rtc-s3c driver initialization

setfreq should be called only after rtc device registration, as it uses rtc device; s3c_rtc_cpu_type should be checked only once it was set.

---
 drivers/rtc/rtc-s3c.c |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

index e5972b2..dc2081f 100644
@@ -488,19 +488,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
 		goto err_nomap;
 	}
 
-	/* check to see if everything is setup correctly */
-
-	s3c_rtc_enable(pdev, 1);
-
- 	pr_debug("s3c2410_rtc: RTCCON=%02x\n",
-		 readb(s3c_rtc_base + S3C2410_RTCCON));
-
-	s3c_rtc_setfreq(&pdev->dev, 1);
-
-	device_init_wakeup(&pdev->dev, 1);
-
-	/* register RTC and exit */
-
+	/* Register rtc and check to see if everything is setup correctly */
 	rtc = rtc_device_register("s3c", &pdev->dev, &s3c_rtcops,
 				  THIS_MODULE);
 

@@ -510,18 +498,27 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
 		goto err_nortc;
 	}
 
+	platform_set_drvdata(pdev, rtc);
+
+	s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data;
+
 	if (s3c_rtc_cpu_type == TYPE_S3C64XX)
 		rtc->max_user_freq = 32768;
 	else
 		rtc->max_user_freq = 128;
 
-	s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data;
+	s3c_rtc_enable(pdev, 1);
+
+	pr_debug("s3c2410_rtc: RTCCON=%02x\n",
+		 readb(s3c_rtc_base + S3C2410_RTCCON));
+
+	s3c_rtc_setfreq(&pdev->dev, 1);
+
+	device_init_wakeup(&pdev->dev, 1);
 
-	platform_set_drvdata(pdev, rtc);
 	return 0;
 
  err_nortc:
-	s3c_rtc_enable(pdev, 0);
 	iounmap(s3c_rtc_base);
 
  err_nomap:

1.7.1

? ????????? ?? 27 ??? 2010 18:57:26 ????? Vasily Khoruzhick ???????:

Hi, Ben.

What about this patch? I've seen similar series on linux-samsung-soc maillist, but neither their series nor my patch is applied to your tree. Why? :)

Regards
Vasily
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100614/3c8e6704/attachment.sig>

Op 14-06-10 08:04, Vasily Khoruzhick schreef:

A similar patch is already in Linus' tree, see e893de59a4982791368b3ce412bc67dd601a88a0.

? ????????? ?? 14 ???? 2010 13:18:24 ????? Maurus Cuelenaere ???????:

Thanks for pointing that.
Sad that this change is not in Ben's next-samsung yet :(

Regards
Vasily
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100614/899b7950/attachment.sig>

Op 14-06-10 12:38, Vasily Khoruzhick schreef:

It's just a matter of rebasing. And AFAICS current Ben's next-samsung == Linus' 2.6.35-rc1 tag.

Maurus Cuelenaere