Commit 9affd6becbfb2c3f0d04e554bb87234761b37aba
1 parent
9607a85b67
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
arm: fix mismerge of arch/arm/mach-omap2/timer.c
I badly screwed up the merge in commit 6fa52ed33bea ("Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/.../arm-soc") by incorrectly taking the arch/arm/mach-omap2/* data fully from the merge target because the 'drivers-for-linus' branch seemed to be a proper superset of the duplicate ARM commits. That was bogus: commit ff931c821bab ("ARM: OMAP: clocks: Delay clk inits atleast until slab is initialized") only existed in head, and the changes to arch/arm/mach-omap2/timer.c from that commit got list. Re-doing the merge more carefully, I do think this part was the only thing I screwed up. Knock wood. Reported-by: Tony Lindgren <tony@atomide.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Olof Johansson <olof@lixom.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff
arch/arm/mach-omap2/timer.c
| ... | ... | @@ -553,6 +553,8 @@ |
| 553 | 553 | clksrc_nr, clksrc_src, clksrc_prop) \ |
| 554 | 554 | void __init omap##name##_gptimer_timer_init(void) \ |
| 555 | 555 | { \ |
| 556 | + if (omap_clk_init) \ | |
| 557 | + omap_clk_init(); \ | |
| 556 | 558 | omap_dmtimer_init(); \ |
| 557 | 559 | omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \ |
| 558 | 560 | omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src, \ |
| ... | ... | @@ -563,6 +565,8 @@ |
| 563 | 565 | clksrc_nr, clksrc_src, clksrc_prop) \ |
| 564 | 566 | void __init omap##name##_sync32k_timer_init(void) \ |
| 565 | 567 | { \ |
| 568 | + if (omap_clk_init) \ | |
| 569 | + omap_clk_init(); \ | |
| 566 | 570 | omap_dmtimer_init(); \ |
| 567 | 571 | omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \ |
| 568 | 572 | /* Enable the use of clocksource="gp_timer" kernel parameter */ \ |