diff options
author | Olof Johansson <olof@lixom.net> | 2013-10-07 09:47:31 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-10-07 09:47:31 -0700 |
commit | c884357ec6e27c7967c78fb111cc8a830881f43b (patch) | |
tree | 2754220c4b8bcec3fda1f25153af2f472e00f4ef /drivers/watchdog/at91rm9200_wdt.c | |
parent | ec01791d0ff7593fbca21a93167138a49bb94768 (diff) | |
parent | 64cc69abbb32e17aa44d2c696eca65cb6f9364ca (diff) | |
download | blackbird-op-linux-c884357ec6e27c7967c78fb111cc8a830881f43b.tar.gz blackbird-op-linux-c884357ec6e27c7967c78fb111cc8a830881f43b.zip |
Merge branch 'clk-of-init-v2_for-3.13' of https://github.com/shesselba/linux-dove into next/cleanup
From Sebastian Hasselbarth:
This is a patch set based on an RFC [1][2] sent earlier to provide
a common arch/arm init for DT clock providers. Currently, the call to
of_clk_init(NULL) to initialize DT clock providers is spread among several
mach-dirs. Since most machs require DT clocks initialized before timers,
no initcall can be used.
By adding of_clk_init(NULL) to arch/arm time_init(), we can remove all
mach-specific .init_time hooks that basically called of_clk_init and
clocksource_of_init.
In contrast to the RFC version, of_clk_init(NULL) is now only called if
no custom .init_time callback is set. This allows some machs to still
call clock init themselves, as not all can be converted now. Therefore,
this patch sets drops conversion of mach-mvebu and mach-zynq. New machs
that were introduced with v3.12-rc1 are also converted, except mach-u300
that requires clocks before irqs.
* 'clk-of-init-v2_for-3.13' of https://github.com/shesselba/linux-dove: (29 commits)
ARM: vt8500: remove custom .init_time hook
ARM: vexpress: remove custom .init_time hook
ARM: tegra: remove custom .init_time hook
ARM: sunxi: remove custom .init_time hook
ARM: sti: remove custom .init_time hook
ARM: socfpga: remove custom .init_time hook
ARM: rockchip: remove custom .init_time hook
ARM: prima2: remove custom .init_time hook
ARM: nspire: remove custom .init_time hook
ARM: nomadik: remove custom .init_time hook
ARM: mxs: remove custom .init_time hook
ARM: kirkwood: remove custom .init_time hook
ARM: imx: remove custom .init_time hook
ARM: highbank: remove custom .init_time hook
ARM: exynos: remove custom .init_time hook
ARM: dove: remove custom .init_time hook
ARM: bcm2835: remove custom .init_time hook
ARM: bcm: provide common arch init for DT clocks
ARM: call of_clk_init from default time_init handler
ARM: vt8500: prepare for arch-wide .init_time callback
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/watchdog/at91rm9200_wdt.c')
0 files changed, 0 insertions, 0 deletions