linux/arch/arm/mach-highbank
Olof Johansson 0fc869e8f2 Merge branch 'cleanup/dt-clock' into next/soc
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: Olof Johansson <olof@lixom.net>
2013-10-28 10:11:42 -07:00
..
core.h ARM: highbank: adapt to use ARM PSCI calls 2013-10-01 16:34:16 -05:00
highbank.c Merge branch 'cleanup/dt-clock' into next/soc 2013-10-28 10:11:42 -07:00
Kconfig ARM: highbank: adapt to use ARM PSCI calls 2013-10-01 16:34:16 -05:00
Makefile ARM: highbank: adapt to use ARM PSCI calls 2013-10-01 16:34:16 -05:00
pm.c ARM: highbank: adapt to use ARM PSCI calls 2013-10-01 16:34:16 -05:00
smc.S ARM: highbank: Add smc calls to enable/disable the L2 2012-06-07 22:39:43 -07:00
sysregs.h ARM: highbank: mask cluster id from cpu_logical_map 2013-01-31 13:54:30 -06:00
system.c reboot: arm: change reboot_mode to use enum reboot_mode 2013-07-09 10:33:29 -07:00