Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b5c211f authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

ARM: shmobile: rcar-gen2: Initialize CCF before clock sources 



When CONFIG_COMMON_CLOCK is enabled, call rcar_gen2_clocks_init() in the
timer init function to initialize the common clock framework before
initializing the clock sources. This will take care of clock
initialization when the r8a779[01] boards will be switched to
multiplatform kernels.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 4d8864c9

arch/arm/mach-shmobile/setup-rcar-gen2.c

+7 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */



#include <linux/clk/shmobile.h>

#include <linux/clocksource.h>

#include <linux/io.h>

#include <linux/kernel.h>
@@ -44,8 +45,10 @@ u32 __init rcar_gen2_read_mode_pins(void) 


void __init rcar_gen2_timer_init(void)

{

#ifdef CONFIG_ARM_ARCH_TIMER

#if defined(CONFIG_ARM_ARCH_TIMER) || defined(CONFIG_COMMON_CLK)

	u32 mode = rcar_gen2_read_mode_pins();

#endif

#ifdef CONFIG_ARM_ARCH_TIMER

	void __iomem *base;

	int extal_mhz = 0;

	u32 freq;
@@ -98,5 +101,8 @@ void __init rcar_gen2_timer_init(void) 
	iounmap(base);

#endif /* CONFIG_ARM_ARCH_TIMER */



#ifdef CONFIG_COMMON_CLK

	rcar_gen2_clocks_init(mode);

#endif

	clocksource_of_init();

}