Merge tag 'omap-devel-dmtimer-for-v3.6' of...
Merge tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/timer From Tony Lindgren <tony@atomide.com>: Here are some omap dmtimer changes to make it easier to add device tree support for dmtimer by simplifying the platform data structure used by dmtimr. * tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap : ARM: OMAP2+: Simplify dmtimer clock aliases ARM: OMAP2+: Move dmtimer clock set function to dmtimer driver ARM: OMAP1: Fix dmtimer support ARM: OMAP: Add flag to indicate if a timer needs a manual reset ARM: OMAP: Remove timer function pointer for context loss counter ARM: OMAP: Remove loses_context variable from timer platform data ARM: OMAP2+: Fix external clock support for dmtimers ARM: OMAP2+: HWMOD: Correct timer device attributes ARM: OMAP: Add DMTIMER capability variable to represent timer features ARM: OMAP2+: Add dmtimer platform function to reserve systimers ARM: OMAP2+: Remove unused max number of timers definition ARM: OMAP: Remove unnecessary clk structure Signed-off-by:Arnd Bergmann <arnd@arndb.de>
No related branches found
No related tags found
Showing
- arch/arm/mach-omap1/timer.c 2 additions, 1 deletionarch/arm/mach-omap1/timer.c
- arch/arm/mach-omap2/clock2420_data.c 3 additions, 36 deletionsarch/arm/mach-omap2/clock2420_data.c
- arch/arm/mach-omap2/clock2430_data.c 3 additions, 36 deletionsarch/arm/mach-omap2/clock2430_data.c
- arch/arm/mach-omap2/clock3xxx_data.c 2 additions, 24 deletionsarch/arm/mach-omap2/clock3xxx_data.c
- arch/arm/mach-omap2/clock44xx_data.c 12 additions, 22 deletionsarch/arm/mach-omap2/clock44xx_data.c
- arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c 0 additions, 8 deletionsarch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c 1 addition, 9 deletionsarch/arm/mach-omap2/omap_hwmod_3xxx_data.c
- arch/arm/mach-omap2/omap_hwmod_44xx_data.c 0 additions, 6 deletionsarch/arm/mach-omap2/omap_hwmod_44xx_data.c
- arch/arm/mach-omap2/timer.c 4 additions, 78 deletionsarch/arm/mach-omap2/timer.c
- arch/arm/plat-omap/dmtimer.c 86 additions, 25 deletionsarch/arm/plat-omap/dmtimer.c
- arch/arm/plat-omap/include/plat/dmtimer.h 5 additions, 17 deletionsarch/arm/plat-omap/include/plat/dmtimer.h
Loading
Please register or sign in to comment