2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-07 21:24:00 +08:00
linux-next/arch/arm/mach-vexpress
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
..
include/mach ARM: vexpress: Start using new Versatile Express infrastructure 2012-11-05 17:09:51 +00:00
core.h ARM: vexpress: Select multi-cluster SMP operation if required 2013-05-29 15:50:35 -04:00
ct-ca9x4.c irqchip: Move ARM gic.h to include/linux/irqchip/arm-gic.h 2013-01-12 10:47:32 -06:00
dcscb_setup.S ARM: vexpress/dcscb: handle platform coherency exit/setup and CCI 2013-05-29 15:50:35 -04:00
dcscb.c ARM: vexpress/MCPM: fix cache disable sequence when CONFIG_FRAME_POINTER=y 2013-08-14 13:05:42 -07:00
hotplug.c ARM: cpu hotplug: remove majority of cache flushing from platforms 2013-04-18 20:08:04 +01:00
Kconfig ARM: SoC platform changes for 3.12 2013-09-06 13:30:06 -07:00
Makefile ARM: vexpress: allow dcscb and tc2_pm in a combined ARMv6+v7 build 2013-09-09 17:38:20 -07:00
platsmp.c ARM: vexpress: Select multi-cluster SMP operation if required 2013-05-29 15:50:35 -04:00
spc.c ARM: vexpress/TC2: add Serial Power Controller (SPC) support 2013-08-07 14:55:24 +01:00
spc.h ARM: vexpress/TC2: add Serial Power Controller (SPC) support 2013-08-07 14:55:24 +01:00
tc2_pm.c ARM: vexpress: tc2: fix hotplug/idle/kexec race on cluster power down 2013-09-30 09:27:36 -07:00
v2m.c ARM: vexpress: remove custom .init_time hook 2013-09-29 21:09:48 +02:00