AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

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

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

Signed-off-by: Jiandong Zheng <jdzheng@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Jiandong Zheng 2011-05-19 00:36:57 +01:00 committed by Russell King
parent 23828a7a97
commit ede2e23456
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-bcmring/arch.c
View File

@ -169,6 +169,7 @@ MACHINE_START(BCMRING, "BCMRING")
/* Maintainer: Broadcom Corporation */ /* Maintainer: Broadcom Corporation */
.fixup = bcmring_fixup, .fixup = bcmring_fixup,
.map_io = bcmring_map_io, .map_io = bcmring_map_io,
.init_early = bcmring_init_early,
.init_irq = bcmring_init_irq, .init_irq = bcmring_init_irq,
.timer = &bcmring_timer, .timer = &bcmring_timer,
.init_machine = bcmring_init_machine .init_machine = bcmring_init_machine

7
arch/arm/mach-bcmring/core.c
View File

@ -151,8 +151,6 @@ void __init bcmring_amba_init(void)
chipcHw_busInterfaceClockEnable(bus_clock); chipcHw_busInterfaceClockEnable(bus_clock);
clkdev_add_table(lookups, ARRAY_SIZE(lookups));
for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
struct amba_device *d = amba_devs[i]; struct amba_device *d = amba_devs[i];
amba_device_register(d, &iomem_resource); amba_device_register(d, &iomem_resource);
@ -365,3 +363,8 @@ void __init bcmring_init_timer(void)
struct sys_timer bcmring_timer = { struct sys_timer bcmring_timer = {
.init = bcmring_init_timer, .init = bcmring_init_timer,
}; };
void __init bcmring_init_early(void)
{
clkdev_add_table(lookups, ARRAY_SIZE(lookups));
}

1
arch/arm/mach-bcmring/core.h
View File

@ -25,6 +25,7 @@
void __init bcmring_amba_init(void); void __init bcmring_amba_init(void);
void __init bcmring_map_io(void); void __init bcmring_map_io(void);
void __init bcmring_init_irq(void); void __init bcmring_init_irq(void);
void __init bcmring_init_early(void);
extern struct sys_timer bcmring_timer; extern struct sys_timer bcmring_timer;
#endif #endif