projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rtc-mxc: remove unnecessary clock source for rtc subsystem
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
rtc
/
rtc-mxc.c
diff --git
a/drivers/rtc/rtc-mxc.c
b/drivers/rtc/rtc-mxc.c
index d71fe61db1d655427e3d10b40113482ee2063a4e..25ec921db07c8a4f5b1ef9f3f2016329007c8f7e 100644
(file)
--- a/
drivers/rtc/rtc-mxc.c
+++ b/
drivers/rtc/rtc-mxc.c
@@
-379,7
+379,6
@@
static struct rtc_class_ops mxc_rtc_ops = {
static int __init mxc_rtc_probe(struct platform_device *pdev)
{
static int __init mxc_rtc_probe(struct platform_device *pdev)
{
- struct clk *clk;
struct resource *res;
struct rtc_device *rtc;
struct rtc_plat_data *pdata = NULL;
struct resource *res;
struct rtc_device *rtc;
struct rtc_plat_data *pdata = NULL;
@@
-402,14
+401,15
@@
static int __init mxc_rtc_probe(struct platform_device *pdev)
pdata->ioaddr = devm_ioremap(&pdev->dev, res->start,
resource_size(res));
pdata->ioaddr = devm_ioremap(&pdev->dev, res->start,
resource_size(res));
- clk = clk_get(&pdev->dev, "ckil");
- if (IS_ERR(clk)) {
- ret = PTR_ERR(clk);
+ pdata->clk = clk_get(&pdev->dev, "rtc");
+ if (IS_ERR(pdata->clk)) {
+ dev_err(&pdev->dev, "unable to get clock!\n");
+ ret = PTR_ERR(pdata->clk);
goto exit_free_pdata;
}
goto exit_free_pdata;
}
-
rate = clk_get_rate(
clk);
-
clk_put(
clk);
+
clk_enable(pdata->
clk);
+
rate = clk_get_rate(pdata->
clk);
if (rate == 32768)
reg = RTC_INPUT_CLK_32768HZ;
if (rate == 32768)
reg = RTC_INPUT_CLK_32768HZ;
@@
-420,7
+420,7
@@
static int __init mxc_rtc_probe(struct platform_device *pdev)
else {
dev_err(&pdev->dev, "rtc clock is not valid (%lu)\n", rate);
ret = -EINVAL;
else {
dev_err(&pdev->dev, "rtc clock is not valid (%lu)\n", rate);
ret = -EINVAL;
- goto exit_
free_pdata
;
+ goto exit_
put_clk
;
}
reg |= RTC_ENABLE_BIT;
}
reg |= RTC_ENABLE_BIT;
@@
-428,18
+428,9
@@
static int __init mxc_rtc_probe(struct platform_device *pdev)
if (((readw(pdata->ioaddr + RTC_RTCCTL)) & RTC_ENABLE_BIT) == 0) {
dev_err(&pdev->dev, "hardware module can't be enabled!\n");
ret = -EIO;
if (((readw(pdata->ioaddr + RTC_RTCCTL)) & RTC_ENABLE_BIT) == 0) {
dev_err(&pdev->dev, "hardware module can't be enabled!\n");
ret = -EIO;
- goto exit_free_pdata;
- }
-
- pdata->clk = clk_get(&pdev->dev, "rtc");
- if (IS_ERR(pdata->clk)) {
- dev_err(&pdev->dev, "unable to get clock!\n");
- ret = PTR_ERR(pdata->clk);
- goto exit_free_pdata;
+ goto exit_put_clk;
}
}
- clk_enable(pdata->clk);
-
rtc = rtc_device_register(pdev->name, &pdev->dev, &mxc_rtc_ops,
THIS_MODULE);
if (IS_ERR(rtc)) {
rtc = rtc_device_register(pdev->name, &pdev->dev, &mxc_rtc_ops,
THIS_MODULE);
if (IS_ERR(rtc)) {