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: kirkwood: Add standby support

2013-10-08 15:41:52 +00:00

board-dt.c

Merge branch 'cleanup/dt-clock' into next/soc

2013-10-28 10:11:42 -07:00

board-mv88f6281gtw_ge.c

ARM: kirkwood: convert the mv88f6281gtw_ge board to DT

2013-08-06 16:14:12 +00:00

common.c

ARM: kirkwood: Add standby support

2013-10-08 15:41:52 +00:00

common.h

ARM: kirkwood: Add standby support

2013-10-08 15:41:52 +00:00

d2net_v2-setup.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

irq.c

ARM: Kirkwood: Fix sparse warnings.

2012-11-19 03:53:46 +00:00

Kconfig

ARM: kirkwood: fix DT building and update defconfig

2013-08-12 18:44:28 +00:00

lacie_v2-common.c

ARM: Kirkwood: Fix sparse warnings.

2012-11-19 03:53:46 +00:00

lacie_v2-common.h

[ARM] Kirkwood: fix timer initialization for LaCie boards

2010-10-21 14:13:58 -04:00

Makefile

ARM: kirkwood: Add standby support

2013-10-08 15:41:52 +00:00

Makefile.boot

ARM: kirkwood: move new dtbs to common Makefile

2012-09-22 14:24:00 -07:00

mpp.c

ARM: Kirkwood: handle mv88f6282 cpu in __kirkwood_variant().

2013-06-06 18:16:04 +00:00

mpp.h

ARM: orion: Fix Orion5x GPIO regression from MPP cleanup

2012-02-09 16:16:31 -08:00

netxbig_v2-setup.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

openrd-setup.c

arch/arm/mach-kirkwood: Avoid using ARRAY_AND_SIZE(e) as a function argument

2013-08-12 19:10:23 +00:00

pcie.c

ARM: kirkwood: Move to ID based MBus window creation

2013-08-06 14:10:05 +00:00

pm.c

ARM: kirkwood: Add standby support

2013-10-08 15:41:52 +00:00

rd88f6192-nas-setup.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

rd88f6281-setup.c

arch/arm/mach-kirkwood: Avoid using ARRAY_AND_SIZE(e) as a function argument

2013-08-12 19:10:23 +00:00

t5325-setup.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

ts41x-setup.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

ts219-setup.c

Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x

2013-05-13 15:57:29 +00:00

tsx1x-common.c

ARM: Kirkwood: Fix sparse warnings.

2012-11-19 03:53:46 +00:00

tsx1x-common.h

ARM: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text

2010-07-26 10:33:08 +01:00