diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2020-03-16 13:24:10 +0100 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2020-03-16 13:24:10 +0100 |
| commit | f7867cffff7b0b4b3aa65a4978b2d93ff1a5f5ae (patch) | |
| tree | fb4ea19b27294fbcb6cf16dad816e02e0abd889c /include | |
| parent | 0585244523f0f4de7e4480375e871617a79cab98 (diff) | |
| parent | 02e6d546e3bdc1a8a764343cd1ba354da07e8623 (diff) | |
| download | cachepc-linux-f7867cffff7b0b4b3aa65a4978b2d93ff1a5f5ae.tar.gz cachepc-linux-f7867cffff7b0b4b3aa65a4978b2d93ff1a5f5ae.zip | |
Merge branch 'timers/drivers/timer-ti-dm' into timers/drivers/next
Diffstat (limited to 'include')
| -rw-r--r-- | include/clocksource/timer-ti-dm.h | 4 | ||||
| -rw-r--r-- | include/linux/platform_data/dmtimer-omap.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/clocksource/timer-ti-dm.h b/include/clocksource/timer-ti-dm.h index 7d9598dc578d..25f05235866e 100644 --- a/include/clocksource/timer-ti-dm.h +++ b/include/clocksource/timer-ti-dm.h @@ -105,17 +105,17 @@ struct omap_dm_timer { void __iomem *pend; /* write pending */ void __iomem *func_base; /* function register base */ + atomic_t enabled; unsigned long rate; unsigned reserved:1; unsigned posted:1; struct timer_regs context; - int (*get_context_loss_count)(struct device *); - int ctx_loss_count; int revision; u32 capability; u32 errata; struct platform_device *pdev; struct list_head node; + struct notifier_block nb; }; int omap_dm_timer_reserve_systimer(int id); diff --git a/include/linux/platform_data/dmtimer-omap.h b/include/linux/platform_data/dmtimer-omap.h index bdaaf537604a..95d852aef130 100644 --- a/include/linux/platform_data/dmtimer-omap.h +++ b/include/linux/platform_data/dmtimer-omap.h @@ -30,12 +30,12 @@ struct omap_dm_timer_ops { int (*stop)(struct omap_dm_timer *timer); int (*set_source)(struct omap_dm_timer *timer, int source); - int (*set_load)(struct omap_dm_timer *timer, int autoreload, - unsigned int value); + int (*set_load)(struct omap_dm_timer *timer, unsigned int value); int (*set_match)(struct omap_dm_timer *timer, int enable, unsigned int match); int (*set_pwm)(struct omap_dm_timer *timer, int def_on, - int toggle, int trigger); + int toggle, int trigger, int autoreload); + int (*get_pwm_status)(struct omap_dm_timer *timer); int (*set_prescaler)(struct omap_dm_timer *timer, int prescaler); unsigned int (*read_counter)(struct omap_dm_timer *timer); |