|
@@ -319,49 +319,7 @@ static int s3c_rtc_proc(struct device *dev, struct seq_file *seq)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static int s3c_rtc_open(struct device *dev)
|
|
|
|
-{
|
|
|
|
- struct platform_device *pdev = to_platform_device(dev);
|
|
|
|
- struct rtc_device *rtc_dev = platform_get_drvdata(pdev);
|
|
|
|
- int ret;
|
|
|
|
-
|
|
|
|
- ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq,
|
|
|
|
- IRQF_DISABLED, "s3c2410-rtc alarm", rtc_dev);
|
|
|
|
-
|
|
|
|
- if (ret) {
|
|
|
|
- dev_err(dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret);
|
|
|
|
- return ret;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq,
|
|
|
|
- IRQF_DISABLED, "s3c2410-rtc tick", rtc_dev);
|
|
|
|
-
|
|
|
|
- if (ret) {
|
|
|
|
- dev_err(dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret);
|
|
|
|
- goto tick_err;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- return ret;
|
|
|
|
-
|
|
|
|
- tick_err:
|
|
|
|
- free_irq(s3c_rtc_alarmno, rtc_dev);
|
|
|
|
- return ret;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-static void s3c_rtc_release(struct device *dev)
|
|
|
|
-{
|
|
|
|
- struct platform_device *pdev = to_platform_device(dev);
|
|
|
|
- struct rtc_device *rtc_dev = platform_get_drvdata(pdev);
|
|
|
|
-
|
|
|
|
- /* do not clear AIE here, it may be needed for wake */
|
|
|
|
-
|
|
|
|
- free_irq(s3c_rtc_alarmno, rtc_dev);
|
|
|
|
- free_irq(s3c_rtc_tickno, rtc_dev);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
static const struct rtc_class_ops s3c_rtcops = {
|
|
static const struct rtc_class_ops s3c_rtcops = {
|
|
- .open = s3c_rtc_open,
|
|
|
|
- .release = s3c_rtc_release,
|
|
|
|
.read_time = s3c_rtc_gettime,
|
|
.read_time = s3c_rtc_gettime,
|
|
.set_time = s3c_rtc_settime,
|
|
.set_time = s3c_rtc_settime,
|
|
.read_alarm = s3c_rtc_getalarm,
|
|
.read_alarm = s3c_rtc_getalarm,
|
|
@@ -425,6 +383,9 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev)
|
|
{
|
|
{
|
|
struct rtc_device *rtc = platform_get_drvdata(dev);
|
|
struct rtc_device *rtc = platform_get_drvdata(dev);
|
|
|
|
|
|
|
|
+ free_irq(s3c_rtc_alarmno, rtc);
|
|
|
|
+ free_irq(s3c_rtc_tickno, rtc);
|
|
|
|
+
|
|
platform_set_drvdata(dev, NULL);
|
|
platform_set_drvdata(dev, NULL);
|
|
rtc_device_unregister(rtc);
|
|
rtc_device_unregister(rtc);
|
|
|
|
|
|
@@ -548,10 +509,32 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
|
|
|
|
|
|
s3c_rtc_setfreq(&pdev->dev, 1);
|
|
s3c_rtc_setfreq(&pdev->dev, 1);
|
|
|
|
|
|
|
|
+ ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq,
|
|
|
|
+ IRQF_DISABLED, "s3c2410-rtc alarm", rtc);
|
|
|
|
+ if (ret) {
|
|
|
|
+ dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret);
|
|
|
|
+ goto err_alarm_irq;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq,
|
|
|
|
+ IRQF_DISABLED, "s3c2410-rtc tick", rtc);
|
|
|
|
+ if (ret) {
|
|
|
|
+ dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret);
|
|
|
|
+ free_irq(s3c_rtc_alarmno, rtc);
|
|
|
|
+ goto err_tick_irq;
|
|
|
|
+ }
|
|
|
|
+
|
|
clk_disable(rtc_clk);
|
|
clk_disable(rtc_clk);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
|
|
+ err_tick_irq:
|
|
|
|
+ free_irq(s3c_rtc_alarmno, rtc);
|
|
|
|
+
|
|
|
|
+ err_alarm_irq:
|
|
|
|
+ platform_set_drvdata(pdev, NULL);
|
|
|
|
+ rtc_device_unregister(rtc);
|
|
|
|
+
|
|
err_nortc:
|
|
err_nortc:
|
|
s3c_rtc_enable(pdev, 0);
|
|
s3c_rtc_enable(pdev, 0);
|
|
clk_disable(rtc_clk);
|
|
clk_disable(rtc_clk);
|