diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-08 18:26:27 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-08 18:26:27 +0300 |
| commit | f3c65c2892cf27cf24ff9161ac9110a04dd57a5e (patch) | |
| tree | c5a6412b1e00ca4d795b40097373287e220bf6f1 /include | |
| parent | a67e5c32aac9d55c0aafa2d9c012a03db69ab1ed (diff) | |
| parent | 7d8d05d11473a169ab4d53bc7fc23d1fe3f1959f (diff) | |
| download | linux-f3c65c2892cf27cf24ff9161ac9110a04dd57a5e.tar.xz | |
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 'include')
| -rw-r--r-- | include/linux/atmel_tc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/atmel_tc.h b/include/linux/atmel_tc.h index b87c1c7c242a..468fdfa643f0 100644 --- a/include/linux/atmel_tc.h +++ b/include/linux/atmel_tc.h @@ -67,6 +67,7 @@ struct atmel_tc { const struct atmel_tcb_config *tcb_config; int irq[3]; struct clk *clk[3]; + struct clk *slow_clk; struct list_head node; bool allocated; }; |