From: Olof Johansson Date: Sun, 9 Mar 2014 07:18:04 +0000 (-0800) Subject: Merge tag 'omap-for-v3.15/prcm-signed' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1e871089f66416ce540d8e362225a0878a5d2c06;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge tag 'omap-for-v3.15/prcm-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/soc Power, reset and clock related changes via Paul Walmsley , 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 --- 1e871089f66416ce540d8e362225a0878a5d2c06 diff --cc arch/arm/mach-omap2/board-generic.c index 5679464a2f88,e94eb0fe95aa..bc6013fbb773 --- a/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