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

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

ARM: integrator: use new init_early for clock tree init 



Initialize the clock tree early.

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

arch/arm/mach-integrator/common.h

+1 −0
Original line number Diff line number Diff line 
void integrator_init_early(void);

void integrator_reserve(void);

arch/arm/mach-integrator/core.c

+5 −2
Original line number Diff line number Diff line
@@ -144,12 +144,15 @@ static struct clk_lookup lookups[] = { 
	}

};



void __init integrator_init_early(void)

{

	clkdev_add_table(lookups, ARRAY_SIZE(lookups));

}



static int __init integrator_init(void)

{

	int i;



	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);

arch/arm/mach-integrator/integrator_ap.c

+2 −1
Original line number Diff line number Diff line
@@ -499,8 +499,9 @@ static struct sys_timer ap_timer = { 
MACHINE_START(INTEGRATOR, "ARM-Integrator")

	/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */

	.boot_params	= 0x00000100,

	.map_io		= ap_map_io,

	.reserve	= integrator_reserve,

	.map_io		= ap_map_io,

	.init_early	= integrator_init_early,

	.init_irq	= ap_init_irq,

	.timer		= &ap_timer,

	.init_machine	= ap_init,

arch/arm/mach-integrator/integrator_cp.c

+9 −2
Original line number Diff line number Diff line
@@ -520,11 +520,17 @@ static struct amba_device *amba_devs[] __initdata = { 
	&clcd_device,

};



static void __init intcp_init_early(void)

{

	clkdev_add_table(cp_lookups, ARRAY_SIZE(cp_lookups));



	integrator_init_early();

}



static void __init intcp_init(void)

{

	int i;



	clkdev_add_table(cp_lookups, ARRAY_SIZE(cp_lookups));

	platform_add_devices(intcp_devs, ARRAY_SIZE(intcp_devs));



	for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
@@ -554,8 +560,9 @@ static struct sys_timer cp_timer = { 
MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP")

	/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */

	.boot_params	= 0x00000100,

	.map_io		= intcp_map_io,

	.reserve	= integrator_reserve,

	.map_io		= intcp_map_io,

	.init_early	= intcp_init_early,

	.init_irq	= intcp_init_irq,

	.timer		= &cp_timer,

	.init_machine	= intcp_init,