• Olof Johansson's avatar
    Merge branch 'cleanup/dt-clock' into next/soc · 0fc869e8
    Olof Johansson authored
    Merging in dt clock cleanup as a pre-req with some of the later SoC branches.
    
    There are a handful of conflicts here -- some of the already merged SoC
    branches should have been based on the cleanup but weren't.
    
    In particular, a remove/add of include on highbank and two remove/remove
    conflicts on kirkwood were fixed up.
    
    * cleanup/dt-clock: (28 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>
    0fc869e8
tegra.c 4.52 KB