diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-04-22 11:53:18 +0200 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-04-22 11:53:25 +0200 |
| commit | a5e11117856147bd35e740b36939f3a8a958e1e6 (patch) | |
| tree | 80d41e4f8821d5d8a60886f19707aee3174cb607 /include | |
| parent | 63cc122381bda123c2b1b0137cca09f66e5be660 (diff) | |
| parent | 346f5e76b3822a2530a03f33b00ee89dfc463326 (diff) | |
| download | linux-a5e11117856147bd35e740b36939f3a8a958e1e6.tar.bz2 | |
Merge branch 'clockevents/cmt-mtu2-tmu-cleanups' into clockevents/3.16
This patch set cleans up the Renesas CMT and TMU drivers in preparation for DT
support.
The first 35 patches are a bunch of necessary cleanups that reorganize the CMT
and TMU drivers, their platform data, and the memory, interrupt and clock
resources they expect. As a result the drivers accept a new platform data
model close to the hardware with supports for all the timer channels using a
single device.
The next 13 patches (36/52 to 48/52) move all CMT and TMU platforms from the
old to the new platform data model. Patches 49/52 to 52/52 then drop support
for the old model and perform one more cleanup.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sh_timer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sh_timer.h b/include/linux/sh_timer.h index 4d9dcd138315..8e1e036d6d45 100644 --- a/include/linux/sh_timer.h +++ b/include/linux/sh_timer.h @@ -7,6 +7,7 @@ struct sh_timer_config { int timer_bit; unsigned long clockevent_rating; unsigned long clocksource_rating; + unsigned int channels_mask; }; #endif /* __SH_TIMER_H__ */ |