Skip to contentSkip to conversation

clockevents/clocksource : armada-370-xp fixes, sh_cmt, em_sti timer-sp and nomadik changes

GIT PULL Daniel Lezcano 2 participants 2 messages Sep 2, 2013 – Sep 11, 2013

lore
Share & tools
lore
#0 lore raw

Hi Thomas,

this is the last minute git pull request, hoping it is not too late.

I had these patches in my tree since a while but I was waiting for the first pull request to be consumed before sending this one out (vacations arrived in the meantime).

The branch contains some fixes for the armada-370-xp, a couple of changes for em_sti and sh_cmt, and finally a couple of patches for the dynamic irq affinity flag which should have been picked for 3.10 but lost in limbo.

The following changes since commit cfb6d656d569510ac9239583ce09e4c92ad54719:

Merge branch 'timers/clockevents-next' of
git://git.linaro.org/people/dlezcano/clockevents into timers/core (2013-08-21 14:59:23 +0200)

are available in the git repository at:

git://git.linaro.org/people/dlezcano/clockevents.git timers/clockevents

for you to fetch changes up to 63ce2cc474ce962d936ae6dfaa6ae2354b1db5b2:

clocksource: armada-370-xp: Add detailed clock requirements in
devicetree binding (2013-09-02 21:44:58 +0200)

----------------------------------------------------------------
Daniel Lezcano (1):
ARM: nomadik: add dynamic irq flag to the timer

Ezequiel Garcia (8):
clocksource: armada-370-xp: Use BIT()
clocksource: armada-370-xp: Simplify TIMER_CTRL register access
clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE
clocksource: armada-370-xp: Introduce new compatibl
clocksource: armada-370-xp: Fix device-tree binding
clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
clocksource: armada-370-xp: Get reference fixed-clock by name
clocksource: armada-370-xp: Add detailed clock requirements in
devicetree binding

Laurent Pinchart (1):
clocksource: em_sti: Convert to devm_* managed helpers

Magnus Damm (1):
clocksource: sh_cmt: 32-bit control register support

Viresh Kumar (1):
ARM: timer-sp: Set dynamic irq affinity

 .../bindings/timer/marvell,armada-370-xp-timer.txt |   36 +++++-
 arch/arm/common/timer-sp.c                         |    3 +-
 arch/arm/mach-mvebu/armada-370-xp.c                |    4 +-
 drivers/clocksource/em_sti.c                       |   49 ++-----
 drivers/clocksource/nomadik-mtu.c                  |    3 +-
 drivers/clocksource/sh_cmt.c                       |   50 +++++--
 drivers/clocksource/time-armada-370-xp.c           |  136
+++++++++++---------
 include/linux/time-armada-370-xp.h                 |   18 ---
 8 files changed, 164 insertions(+), 135 deletions(-)
 delete mode 100644 include/linux/time-armada-370-xp.h
Signature · 5 lines
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
#1 lore raw

Hi Thomas, Daniel,

On Mon, Sep 02, 2013 at 10:01:56PM +0200, Daniel Lezcano wrote:
[..]

Quoted 10 lines

The following changes since commit cfb6d656d569510ac9239583ce09e4c92ad54719:

Merge branch 'timers/clockevents-next' of
git://git.linaro.org/people/dlezcano/clockevents into timers/core (2013-08-21 14:59:23 +0200)

are available in the git repository at:

Quoted 7 lines

git://git.linaro.org/people/dlezcano/clockevents.git timers/clockevents

for you to fetch changes up to 63ce2cc474ce962d936ae6dfaa6ae2354b1db5b2:

clocksource: armada-370-xp: Add detailed clock requirements in
devicetree binding (2013-09-02 21:44:58 +0200)

I've seen Ingo's timer pull on September 3rd, so I'm pretty sure this late pull won't make it for v3.12.

Can you confirm this?

Signature · 3 lines
Ezequiel García, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com