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

Commit b997f6e2 authored by Viresh Kumar's avatar Viresh Kumar Committed by Russell King
Browse files

ARM: 6926/1: SPEAr clock: Define common clk_init routine in plat/clock.c 



Define common clk_init routine in plat/clock.c for calling recalc_root_clocks.
This routine will be used for any common code across all machine families.
Whereas family specific spear*xx_clk_init routines will be used for family
specific code.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 16c29daf

arch/arm/mach-spear3xx/clock.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -732,12 +732,12 @@ static struct clk_lookup spear_clk_lookups[] = { 
#endif

#endif

};

};





void __init clk_init(void)

void __init spear3xx_clk_init(void)

{

{

	int i;

	int i;





	for (i = 0; i < ARRAY_SIZE(spear_clk_lookups); i++)

	for (i = 0; i < ARRAY_SIZE(spear_clk_lookups); i++)

		clk_register(&spear_clk_lookups[i]);

		clk_register(&spear_clk_lookups[i]);





	recalc_root_clocks();

	clk_init();

}
 
}

arch/arm/mach-spear3xx/include/mach/generic.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ extern struct amba_device uart_device; 
extern struct sys_timer spear3xx_timer;

extern struct sys_timer spear3xx_timer;





/* Add spear3xx family function declarations here */

/* Add spear3xx family function declarations here */

void __init clk_init(void);

void __init spear3xx_clk_init(void);

void __init spear_setup_timer(void);

void __init spear_setup_timer(void);

void __init spear3xx_map_io(void);

void __init spear3xx_map_io(void);

void __init spear3xx_init_irq(void);

void __init spear3xx_init_irq(void);

arch/arm/mach-spear3xx/spear3xx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ void __init spear3xx_map_io(void) 
	iotable_init(spear3xx_io_desc, ARRAY_SIZE(spear3xx_io_desc));

	iotable_init(spear3xx_io_desc, ARRAY_SIZE(spear3xx_io_desc));





	/* This will initialize clock framework */

	/* This will initialize clock framework */

	clk_init();

	spear3xx_clk_init();

}

}





/* pad multiplexing support */

/* pad multiplexing support */

arch/arm/mach-spear6xx/clock.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -671,12 +671,12 @@ static struct clk_lookup spear_clk_lookups[] = { 
	{ .dev_id = "gpio2",		.clk = &gpio2_clk},

	{ .dev_id = "gpio2",		.clk = &gpio2_clk},

};

};





void __init clk_init(void)

void __init spear6xx_clk_init(void)

{

{

	int i;

	int i;





	for (i = 0; i < ARRAY_SIZE(spear_clk_lookups); i++)

	for (i = 0; i < ARRAY_SIZE(spear_clk_lookups); i++)

		clk_register(&spear_clk_lookups[i]);

		clk_register(&spear_clk_lookups[i]);





	recalc_root_clocks();

	clk_init();

}
 
}

arch/arm/mach-spear6xx/include/mach/generic.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ void __init spear6xx_map_io(void); 
void __init spear6xx_init_irq(void);

void __init spear6xx_init_irq(void);

void __init spear6xx_init(void);

void __init spear6xx_init(void);

void __init spear600_init(void);

void __init spear600_init(void);

void __init clk_init(void);

void __init spear6xx_clk_init(void);





/* Add spear600 machine device structure declarations here */

/* Add spear600 machine device structure declarations here */