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

Commit ede2e234 authored by Jiandong Zheng's avatar Jiandong Zheng Committed by Russell King
Browse files

ARM: 6912/1: bcmring: Add clkdev table in init_early 



Move adding clkdev table to init_early to make sure the common sp804 clockevents can be initialized properly.

Signed-off-by: default avatarJiandong Zheng <jdzheng@broadcom.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 23828a7a

arch/arm/mach-bcmring/arch.c

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ MACHINE_START(BCMRING, "BCMRING") 
	/* Maintainer: Broadcom Corporation */

	.fixup = bcmring_fixup,

	.map_io = bcmring_map_io,

	.init_early = bcmring_init_early,

	.init_irq = bcmring_init_irq,

	.timer = &bcmring_timer,

	.init_machine = bcmring_init_machine

arch/arm/mach-bcmring/core.c

+5 −2
Original line number Diff line number Diff line
@@ -151,8 +151,6 @@ void __init bcmring_amba_init(void) 


	chipcHw_busInterfaceClockEnable(bus_clock);



	clkdev_add_table(lookups, ARRAY_SIZE(lookups));



	for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {

		struct amba_device *d = amba_devs[i];

		amba_device_register(d, &iomem_resource);
@@ -365,3 +363,8 @@ void __init bcmring_init_timer(void) 
struct sys_timer bcmring_timer = {

	.init = bcmring_init_timer,

};



void __init bcmring_init_early(void)

{

	clkdev_add_table(lookups, ARRAY_SIZE(lookups));

}

arch/arm/mach-bcmring/core.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
void __init bcmring_amba_init(void);

void __init bcmring_map_io(void);

void __init bcmring_init_irq(void);

void __init bcmring_init_early(void);



extern struct sys_timer bcmring_timer;

#endif