Commit ad3bb19c authored by Russell King's avatar Russell King
Browse files

ARM: versatile: use new init_early for clock tree and sched_clock init 



Initialize the clock tree and our sched_clock() early.

Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c735c987

arch/arm/mach-versatile/core.c

+11 −12
Original line number Diff line number Diff line
@@ -762,14 +762,21 @@ static void versatile_leds_event(led_event_t ledevt) 
}

#endif	/* CONFIG_LEDS */



void __init versatile_init(void)

/* Early initializations */

void __init versatile_init_early(void)

{

	int i;



	osc4_clk.vcoreg	= __io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_OSCCLCD_OFFSET;

	void __iomem *sys = __io_address(VERSATILE_SYS_BASE);



	osc4_clk.vcoreg	= sys + VERSATILE_SYS_OSCCLCD_OFFSET;

	clkdev_add_table(lookups, ARRAY_SIZE(lookups));



	versatile_sched_clock_init(sys + VERSATILE_SYS_24MHz_OFFSET, 24000000);

}



void __init versatile_init(void)

{

	int i;



	platform_device_register(&versatile_flash_device);

	platform_device_register(&versatile_i2c_device);

	platform_device_register(&smc91x_device);
@@ -785,12 +792,6 @@ void __init versatile_init(void) 
#endif

}



/*

 * The sched_clock counter

 */

#define REFCOUNTER		(__io_address(VERSATILE_SYS_BASE) + \

				 VERSATILE_SYS_24MHz_OFFSET)



/*

 * Where is the timer (VA)?

 */
@@ -806,8 +807,6 @@ static void __init versatile_timer_init(void) 
{

	u32 val;



	versatile_sched_clock_init(REFCOUNTER, 24000000);



	/* 

	 * set clock frequency: 

	 *	VERSATILE_REFCLK is 32KHz

arch/arm/mach-versatile/core.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/amba/bus.h>



extern void __init versatile_init(void);

extern void __init versatile_init_early(void);

extern void __init versatile_init_irq(void);

extern void __init versatile_map_io(void);

extern struct sys_timer versatile_timer;

arch/arm/mach-versatile/versatile_ab.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ MACHINE_START(VERSATILE_AB, "ARM-Versatile AB") 
	/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */

	.boot_params	= 0x00000100,

	.map_io		= versatile_map_io,

	.init_early	= versatile_init_early,

	.init_irq	= versatile_init_irq,

	.timer		= &versatile_timer,

	.init_machine	= versatile_init,

arch/arm/mach-versatile/versatile_pb.c

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ MACHINE_START(VERSATILE_PB, "ARM-Versatile PB") 
	/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */

	.boot_params	= 0x00000100,

	.map_io		= versatile_map_io,

	.init_early	= versatile_init_early,

	.init_irq	= versatile_init_irq,

	.timer		= &versatile_timer,

	.init_machine	= versatile_pb_init,