Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rtc: sa1100: prepare to share sa1100_rtc_ops

Browse source 
Factor out the RTC initialization from the platform device specific
parts in order to share the RTC device ops with other drivers.
Specifically, it will be shared with rtc-pxa driver.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: rtc-linux@googlegroups.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
This commit is contained in:
Rob Herring 2015-05-12 16:23:23 -05:00 committed by Alexandre Belloni
parent dc2280ebf4
commit 8c0961ba7c
2 changed files with 49 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
drivers/rtc/rtc-sa1100.c
View file

@ -42,17 +42,12 @@
#include <mach/regs-rtc.h> #include <mach/regs-rtc.h>
#endif #endif
#include "rtc-sa1100.h"
#define RTC_DEF_DIVIDER (32768 - 1) #define RTC_DEF_DIVIDER (32768 - 1)
#define RTC_DEF_TRIM 0 #define RTC_DEF_TRIM 0
#define RTC_FREQ 1024 #define RTC_FREQ 1024
struct sa1100_rtc {
spinlock_t lock;
int irq_1hz;
int irq_alarm;
struct rtc_device *rtc;
struct clk *clk;
};
static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id) static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)
{ {
@ -223,29 +218,18 @@ static const struct rtc_class_ops sa1100_rtc_ops = {
.alarm_irq_enable = sa1100_rtc_alarm_irq_enable, .alarm_irq_enable = sa1100_rtc_alarm_irq_enable,
}; };
static int sa1100_rtc_probe(struct platform_device *pdev) int sa1100_rtc_init(struct platform_device *pdev, struct sa1100_rtc *info)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
struct sa1100_rtc *info; int ret;
int irq_1hz, irq_alarm, ret = 0;
irq_1hz = platform_get_irq_byname(pdev, "rtc 1Hz"); spin_lock_init(&info->lock);
irq_alarm = platform_get_irq_byname(pdev, "rtc alarm");
if (irq_1hz < 0 || irq_alarm < 0)
return -ENODEV;
info = devm_kzalloc(&pdev->dev, sizeof(struct sa1100_rtc), GFP_KERNEL);
if (!info)
return -ENOMEM;
info->clk = devm_clk_get(&pdev->dev, NULL); info->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(info->clk)) { if (IS_ERR(info->clk)) {
dev_err(&pdev->dev, "failed to find rtc clock source\n"); dev_err(&pdev->dev, "failed to find rtc clock source\n");
return PTR_ERR(info->clk); return PTR_ERR(info->clk);
} }
info->irq_1hz = irq_1hz;
info->irq_alarm = irq_alarm;
spin_lock_init(&info->lock);
platform_set_drvdata(pdev, info);
ret = clk_prepare_enable(info->clk); ret = clk_prepare_enable(info->clk);
if (ret) if (ret)
@ -265,14 +249,11 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
RCNR = 0; RCNR = 0;
} }
device_init_wakeup(&pdev->dev, 1);
rtc = devm_rtc_device_register(&pdev->dev, pdev->name, &sa1100_rtc_ops, rtc = devm_rtc_device_register(&pdev->dev, pdev->name, &sa1100_rtc_ops,
THIS_MODULE); THIS_MODULE);
if (IS_ERR(rtc)) { if (IS_ERR(rtc)) {
ret = PTR_ERR(rtc); clk_disable_unprepare(info->clk);
goto err_dev; return PTR_ERR(rtc);
} }
info->rtc = rtc; info->rtc = rtc;
@ -301,9 +282,29 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
RTSR = RTSR_AL | RTSR_HZ; RTSR = RTSR_AL | RTSR_HZ;
return 0; return 0;
err_dev: }
clk_disable_unprepare(info->clk); EXPORT_SYMBOL_GPL(sa1100_rtc_init);
return ret;
static int sa1100_rtc_probe(struct platform_device *pdev)
{
struct sa1100_rtc *info;
int irq_1hz, irq_alarm;
irq_1hz = platform_get_irq_byname(pdev, "rtc 1Hz");
irq_alarm = platform_get_irq_byname(pdev, "rtc alarm");
if (irq_1hz < 0 || irq_alarm < 0)
return -ENODEV;
info = devm_kzalloc(&pdev->dev, sizeof(struct sa1100_rtc), GFP_KERNEL);
if (!info)
return -ENOMEM;
info->irq_1hz = irq_1hz;
info->irq_alarm = irq_alarm;
platform_set_drvdata(pdev, info);
device_init_wakeup(&pdev->dev, 1);
return sa1100_rtc_init(pdev, info);
} }
static int sa1100_rtc_remove(struct platform_device *pdev) static int sa1100_rtc_remove(struct platform_device *pdev)

19
drivers/rtc/rtc-sa1100.h Normal file
View file

@ -0,0 +1,19 @@
#ifndef __RTC_SA1100_H__
#define __RTC_SA1100_H__
#include <linux/kernel.h>
struct clk;
struct platform_device;
struct sa1100_rtc {
spinlock_t lock;
int irq_1hz;
int irq_alarm;
struct rtc_device *rtc;
struct clk *clk;
};
int sa1100_rtc_init(struct platform_device *pdev, struct sa1100_rtc *info);
#endif