Merge tag 'omap-for-v3.15/prcm-signed' of git://git.kernel.org/pub/scm/linux/kernel...

Power, reset and clock related changes via Paul Walmsley <paul@pwsan.com>, via
Tony Lindgren:

Some low-level optimizations and fixes that don't belong in an -rc
series for various OMAP-family chips, targeted for v3.15.

Basic build, boot, and PM test logs are available here:

http://www.pwsan.com/omap/testlogs/prcm-a-for-v3.15/20140228124518/

* tag 'omap-for-v3.15/prcm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP3+: DPLL: stop reparenting to same parent if already done
  ARM: OMAP2+: clock: fix rate prints
  ARM: AM43x: hwmod data: register spinlock OCP interface
  ARM: OMAP2+: clockdomain: Reintroduce SW_SLEEP Support
  ARM: OMAP2+: AM43xx: implement support for machine restart

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-omap2/board-generic.c
index 5679464a2f8806465ff2f7044216f43f87e907c7,e94eb0fe95aabc6a08739a01300b835ac907d6ec..bc6013fbb7732682c1426a19922bc6ef86281082
--- 1/arch/arm/mach-omap2/board-generic.c
--- 2/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@@ -229,8 -229,9 +229,9 @@@ DT_MACHINE_START(AM43_DT, "Generic AM4
        .init_late      = am43xx_init_late,
        .init_irq       = omap_gic_of_init,
        .init_machine   = omap_generic_init,
 -      .init_time      = omap3_sync32k_timer_init,
 +      .init_time      = omap3_gptimer_timer_init,
        .dt_compat      = am43_boards_compat,
+       .restart        = omap44xx_restart,
  MACHINE_END
  #endif