| Submitter | Michal Simek |
|---|---|
| Date | Jan. 21, 2013, 5:14 p.m. |
| Message ID | <CAHTX3dJ1JdqH9NKYxOYdOE=5x4fMO2JSNMbcq7dkvPNJkC0VAg@mail.gmail.com> |
| Download | mbox |
| Permalink | /patch/214235/ |
| State | New |
| Headers | show |
Pull-request
git://git.xilinx.com/linux-xlnx.git zynq/timerComments
On Monday 21 January 2013, Michal Simek wrote: > please pull these timer changes to your arm-soc tree. > I am aware about any dependency. > > Please let me know if you have any problem with this patchset. > > git://git.xilinx.com/linux-xlnx.git zynq/timer > > Soren Brinkmann (7): > arm: zynq: timer: Replace PSS through PS > arm: zynq: timer: Remove unnecessary register write > arm: zynq: timer: Remove unused #defines > arm: zynq: timer: Align columns > arm: zynq: timer: Remove redundant #includes > arm: zynq: timer: Fix comment style > arm: zynq: timer: Set clock_event cpumask I see nothing wrong with the patches themselves, but there are some cleanups in arm-soc for timers that will conflict with them. Please have a look at the contents of the timer/cleanup and clocksource/cleanup branches in arm-soc, and merge them into your branch. If everything still works, you can add a patch on top of the merge to move your driver to drivers/clocksource and use the new infrastructure introduced there. Arnd
2013/1/21 Arnd Bergmann <arnd@arndb.de>: > On Monday 21 January 2013, Michal Simek wrote: >> please pull these timer changes to your arm-soc tree. >> I am aware about any dependency. >> >> Please let me know if you have any problem with this patchset. >> >> git://git.xilinx.com/linux-xlnx.git zynq/timer >> >> Soren Brinkmann (7): >> arm: zynq: timer: Replace PSS through PS >> arm: zynq: timer: Remove unnecessary register write >> arm: zynq: timer: Remove unused #defines >> arm: zynq: timer: Align columns >> arm: zynq: timer: Remove redundant #includes >> arm: zynq: timer: Fix comment style >> arm: zynq: timer: Set clock_event cpumask > > I see nothing wrong with the patches themselves, but there are some > cleanups in arm-soc for timers that will conflict with them. > > Please have a look at the contents of the timer/cleanup and clocksource/cleanup > branches in arm-soc, and merge them into your branch. If everything still > works, you can add a patch on top of the merge to move your driver to > drivers/clocksource and use the new infrastructure introduced there. ok. Will look at it tmr. Thanks, Michal
Hi Arnd and Olof, please pull these timer changes to your arm-soc tree. I am aware about any dependency. Please let me know if you have any problem with this patchset. Thanks, Michal The following changes since commit 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619: Linus Torvalds (1): Linux 3.8-rc4 are available in the git repository at: git://git.xilinx.com/linux-xlnx.git zynq/timer Soren Brinkmann (7): arm: zynq: timer: Replace PSS through PS arm: zynq: timer: Remove unnecessary register write arm: zynq: timer: Remove unused #defines arm: zynq: timer: Align columns arm: zynq: timer: Remove redundant #includes arm: zynq: timer: Fix comment style arm: zynq: timer: Set clock_event cpumask arch/arm/mach-zynq/common.c | 6 +- arch/arm/mach-zynq/common.h | 2 +- arch/arm/mach-zynq/timer.c | 150 ++++++++++++++++++++---------------------- 3 files changed, 75 insertions(+), 83 deletions(-)