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

Commit 198b51e8 authored by Russell King's avatar Russell King
Browse files

ARM: sa1100: register clocks early 



Since we switched to use pxa_timer, we need to provide the OSTIMER0
clock.  However, as the clock is initialised early, we need to provide
the clock early as well, so that pxa_timer can find it.  Adding the
clock to the clkdev table at core_initcall() time is way too late.

Move the initialisation earlier.

Fixes: ee3a4020 ("ARM: 8250/1: sa1100: provide OSTIMER0 clock for pxa_timer")
Acked-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 02ba38a5

arch/arm/mach-sa1100/clock.c

+1 −2
Original line number Diff line number Diff line
@@ -142,9 +142,8 @@ static struct clk_lookup sa11xx_clkregs[] = { 
	CLKDEV_INIT(NULL, "OSTIMER0", &clk_36864),

};



static int __init sa11xx_clk_init(void)

int __init sa11xx_clk_init(void)

{

	clkdev_add_table(sa11xx_clkregs, ARRAY_SIZE(sa11xx_clkregs));

	return 0;

}
 
core_initcall(sa11xx_clk_init);

arch/arm/mach-sa1100/generic.c

+1 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ void __init sa1100_init_irq(void) 
	sa11x0_init_irq_nodt(IRQ_GPIO0_SC, irq_resource.start);



	sa1100_init_gpio();

	sa11xx_clk_init();

}



/*

arch/arm/mach-sa1100/generic.h

+2 −0
Original line number Diff line number Diff line
@@ -44,3 +44,5 @@ int sa11x0_pm_init(void); 
#else

static inline int sa11x0_pm_init(void) { return 0; }

#endif



int sa11xx_clk_init(void);