diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-08 17:26:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-08 17:26:27 +0200 |
| commit | f3c65c2892cf27cf24ff9161ac9110a04dd57a5e (patch) | |
| tree | c5a6412b1e00ca4d795b40097373287e220bf6f1 /drivers/misc | |
| parent | a67e5c32aac9d55c0aafa2d9c012a03db69ab1ed (diff) | |
| parent | 7d8d05d11473a169ab4d53bc7fc23d1fe3f1959f (diff) | |
Merge tag 'at91-cleanup-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/drivers
Merge "First batch of cleanups for 4.4:" from Alexandre Belloni:
- properly get the slow clock from timer-atmel-st, tcb_clksrc and pwm-atmel-tcb
- small fix in an error path for tcb_clksrc
* tag 'at91-cleanup-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
misc: atmel_tclib: get and use slow clock
clocksource: tcb_clksrc: fix setup_clkevents error path
clocksource: atmel-st: get and use slow clock
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/atmel_tclib.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c index 0ca05c3ec8d6..ac24a4bd63f7 100644 --- a/drivers/misc/atmel_tclib.c +++ b/drivers/misc/atmel_tclib.c @@ -125,6 +125,10 @@ static int __init tc_probe(struct platform_device *pdev) if (IS_ERR(clk)) return PTR_ERR(clk); + tc->slow_clk = devm_clk_get(&pdev->dev, "slow_clk"); + if (IS_ERR(tc->slow_clk)) + return PTR_ERR(tc->slow_clk); + r = platform_get_resource(pdev, IORESOURCE_MEM, 0); tc->regs = devm_ioremap_resource(&pdev->dev, r); if (IS_ERR(tc->regs)) |