linux-toradex.git/drivers/clocksource/time-armada-370-xp.c, branch v3.12.16

Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-16T20:10:26+00:00

Pull timer code update from Thomas Gleixner:
 - armada SoC clocksource overhaul with a trivial merge conflict
 - Minor improvements to various SoC clocksource drivers

* 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: armada-370-xp: Add detailed clock requirements in devicetree binding
  clocksource: armada-370-xp: Get reference fixed-clock by name
  clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
  clocksource: armada-370-xp: Fix device-tree binding
  clocksource: armada-370-xp: Introduce new compatibles
  clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE
  clocksource: armada-370-xp: Simplify TIMER_CTRL register access
  clocksource: armada-370-xp: Use BIT()
  ARM: timer-sp: Set dynamic irq affinity
  ARM: nomadik: add dynamic irq flag to the timer
  clocksource: sh_cmt: 32-bit control register support
  clocksource: em_sti: Convert to devm_* managed helpers

clocksource: armada-370-xp: Get reference fixed-clock by name

2013-09-02T19:44:52+00:00

The Armada XP timer has two mandatory clock inputs: nbclk and refclk,
as specified by the device-tree binding.

This commit fixes the clock selection. Instead of hard-coding the clock
rate for the 25 MHz reference fixed-clock, obtain the clock by its name.

Signed-off-by: Ezequiel Garcia 
Signed-off-by: Daniel Lezcano 
Acked-by: Jason Cooper 
Acked-by: Gregory CLEMENT

clocksource: armada-370-xp: Replace WARN_ON with BUG_ON

2013-09-02T19:44:13+00:00

If the clock fails to be obtained and the timer fails to be properly
registered, the kernel will freeze real soon. Instead, let's BUG()
where the actual problem is located.

Signed-off-by: Ezequiel Garcia 
Signed-off-by: Daniel Lezcano 
Acked-by: Jason Cooper 
Acked-by: Gregory CLEMENT

clocksource: armada-370-xp: Introduce new compatibles

2013-09-02T19:44:03+00:00

The Armada XP SoC clocksource driver cannot work without the 25 MHz
fixed timer. Therefore it's appropriate to introduce a new compatible
string and use it to set the 25 MHz fixed timer.

The 'marvell,timer-25MHz' property will be marked as deprecated.

Signed-off-by: Ezequiel Garcia 
Signed-off-by: Daniel Lezcano 
Reviewed-by: Andrew Lunn

clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE

2013-09-02T19:44:01+00:00

This is almost cosmetic: we achieve a bit of consistency with
other clocksource drivers by using the CLOCKSOURCE_OF_DECLARE
macro for the boilerplate code.

Signed-off-by: Ezequiel Garcia 
Signed-off-by: Daniel Lezcano 
Reviewed-by: Andrew Lunn

clocksource: armada-370-xp: Simplify TIMER_CTRL register access

2013-09-02T19:43:58+00:00

This commit creates two functions to access the TIMER_CTRL register:
one for global one for the per-cpu. This makes the code much more
readable. In addition, since the TIMER_CTRL register is also used for
watchdog, this is preparation work for future thread-safe improvements.

Acked-by: Gregory CLEMENT 
Reviewed-by: Andrew Lunn 
Signed-off-by: Ezequiel Garcia 
Signed-off-by: Daniel Lezcano

clocksource: armada-370-xp: Use BIT()

2013-09-02T19:40:05+00:00

This is a purely cosmetic commit: we replace hardcoded values that
representing bits by BIT(), which is slightly more readable.

Signed-off-by: Ezequiel Garcia 
Signed-off-by: Daniel Lezcano 
Reviewed-by: Andrew Lunn

Merge tag 'remove-local-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup

2013-07-23T23:54:15+00:00

From Stephen Boyd:

Now that we have a generic arch hook for broadcast we can remove the
local timer API entirely. Doing so will reduce code in ARM core, reduce
the architecture dependencies of our timer drivers, and simplify the code
because we no longer go through an architecture layer that is essentially
a hotplug notifier.

* tag 'remove-local-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  ARM: smp: Remove local timer API
  clocksource: time-armada-370-xp: Divorce from local timer API
  clocksource: time-armada-370-xp: Fix sparse warning
  ARM: msm: Divorce msm_timer from local timer API
  ARM: PRIMA2: Divorce timer-marco from local timer API
  ARM: EXYNOS4: Divorce mct from local timer API
  ARM: OMAP2+: Divorce from local timer API
  ARM: smp_twd: Divorce smp_twd from local timer API
  ARM: smp: Remove duplicate dummy timer implementation

Resolved a large number of conflicts due to __cpuinit cleanups, etc.

Signed-off-by: Olof Johansson

clocksource+irqchip: delete __cpuinit usage from all related files

2013-07-14T23:36:57+00:00

The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications.  For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.

After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out.  Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.

This removes all the drivers/clocksource and drivers/irqchip uses of
the __cpuinit macros from all C files.

[1] https://lkml.org/lkml/2013/5/20/589

Cc: John Stultz 
Cc: Thomas Gleixner 
Acked-by: Thomas Gleixner 
Signed-off-by: Paul Gortmaker

clocksource: time-armada-370-xp: Divorce from local timer API

2013-06-25T00:47:34+00:00

Separate the armada 370xp local timers from the local timer API.
This will allow us to remove ARM local timer support in the near
future and makes this driver multi-architecture friendly.

Acked-by: Gregory CLEMENT 
Tested-by: Gregory CLEMENT 
Acked-by: Marc Zyngier 
Signed-off-by: Stephen Boyd