• Olof Johansson's avatar
    Merge branch 'clk-of-init-v2_for-3.13' of https://github.com/shesselba/linux-dove into next/cleanup · c884357e
    Olof Johansson authored
    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: default avatarOlof Johansson <olof@lixom.net>
    c884357e
mach-imx6q.c 6.81 KB