diff options
| author | Paul Cercueil <paul@crapouillou.net> | 2020-05-06 00:13:32 +0200 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2020-05-11 16:34:58 +0200 |
| commit | 796be8b59dec3efe840a251e2ecc0734408c5ff3 (patch) | |
| tree | 523f82d06f8d9000445024725c8f6e764fb9a604 /drivers/rtc | |
| parent | rtc: ingenic: Use local 'dev' variable in probe (diff) | |
| download | linux-796be8b59dec3efe840a251e2ecc0734408c5ff3.tar.xz linux-796be8b59dec3efe840a251e2ecc0734408c5ff3.zip | |
rtc: ingenic: Enable clock in probe
It makes no sense to request a clock and not enable it even though the
hardware is being used. So the driver now enables the clock in the
probe. Besides, now we can properly handle errors.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20200505221336.222313-3-paul@crapouillou.net
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-jz4740.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c index 06ee08089815..129c68cebb92 100644 --- a/drivers/rtc/rtc-jz4740.c +++ b/drivers/rtc/rtc-jz4740.c @@ -264,8 +264,6 @@ static void jz4740_rtc_power_off(void) unsigned long wakeup_filter_ticks; unsigned long reset_counter_ticks; - clk_prepare_enable(rtc->clk); - rtc_rate = clk_get_rate(rtc->clk); /* @@ -297,6 +295,11 @@ static void jz4740_rtc_power_off(void) kernel_halt(); } +static void jz4740_rtc_clk_disable(void *data) +{ + clk_disable_unprepare(data); +} + static const struct of_device_id jz4740_rtc_of_match[] = { { .compatible = "ingenic,jz4740-rtc", .data = (void *)ID_JZ4740 }, { .compatible = "ingenic,jz4760-rtc", .data = (void *)ID_JZ4760 }, @@ -332,6 +335,18 @@ static int jz4740_rtc_probe(struct platform_device *pdev) return PTR_ERR(rtc->clk); } + ret = clk_prepare_enable(rtc->clk); + if (ret) { + dev_err(dev, "Failed to enable clock\n"); + return ret; + } + + ret = devm_add_action_or_reset(dev, jz4740_rtc_clk_disable, rtc->clk); + if (ret) { + dev_err(dev, "Failed to register devm action\n"); + return ret; + } + spin_lock_init(&rtc->lock); platform_set_drvdata(pdev, rtc); |