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

Commit 5c881d9a authored by Shiraz Hashim's avatar Shiraz Hashim Committed by Russell King
Browse files

ARM: 6737/1: SPEAr: formalized timer support 



Move platform specific timer initialization code is moved into platform
specific files.

Reviewed-by: default avatarJamie Iles <jamie@jamieiles.com>
Reviewed-by: default avatarStanley Miao <stanley.miao@windriver.com>
Signed-off-by: default avatarShiraz Hashim <shiraz.hashim@st.com>
Signed-off-by: default avatarRajeev Kumar <rajeev-dlh.kumar@st.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 53688c51

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

+2 −1
Original line number Diff line number Diff line
@@ -33,10 +33,11 @@ 
/* Add spear3xx family device structure declarations here */

extern struct amba_device gpio_device;

extern struct amba_device uart_device;

extern struct sys_timer spear_sys_timer;

extern struct sys_timer spear3xx_timer;



/* Add spear3xx family function declarations here */

void __init clk_init(void);

void __init spear_setup_timer(void);

void __init spear3xx_map_io(void);

void __init spear3xx_init_irq(void);

void __init spear3xx_init(void);

arch/arm/mach-spear3xx/spear300_evb.c

+1 −1
Original line number Diff line number Diff line
@@ -71,6 +71,6 @@ MACHINE_START(SPEAR300, "ST-SPEAR300-EVB") 
	.boot_params	=	0x00000100,

	.map_io		=	spear3xx_map_io,

	.init_irq	=	spear3xx_init_irq,

	.timer		=	&spear_sys_timer,

	.timer		=	&spear3xx_timer,

	.init_machine	=	spear300_evb_init,

MACHINE_END

arch/arm/mach-spear3xx/spear310_evb.c

+1 −1
Original line number Diff line number Diff line
@@ -78,6 +78,6 @@ MACHINE_START(SPEAR310, "ST-SPEAR310-EVB") 
	.boot_params	=	0x00000100,

	.map_io		=	spear3xx_map_io,

	.init_irq	=	spear3xx_init_irq,

	.timer		=	&spear_sys_timer,

	.timer		=	&spear3xx_timer,

	.init_machine	=	spear310_evb_init,

MACHINE_END

arch/arm/mach-spear3xx/spear320_evb.c

+1 −1
Original line number Diff line number Diff line
@@ -75,6 +75,6 @@ MACHINE_START(SPEAR320, "ST-SPEAR320-EVB") 
	.boot_params	=	0x00000100,

	.map_io		=	spear3xx_map_io,

	.init_irq	=	spear3xx_init_irq,

	.timer		=	&spear_sys_timer,

	.timer		=	&spear3xx_timer,

	.init_machine	=	spear320_evb_init,

MACHINE_END

arch/arm/mach-spear3xx/spear3xx.c

+31 −1
Original line number Diff line number Diff line
@@ -523,5 +523,35 @@ struct pmx_dev pmx_plgpio_45_46_49_50 = { 
	.mode_count = ARRAY_SIZE(pmx_plgpio_45_46_49_50_modes),

	.enb_on_reset = 1,

};

#endif /* CONFIG_MACH_SPEAR310 || CONFIG_MACH_SPEAR320 */



#endif
 
static void __init spear3xx_timer_init(void)

{

	char pclk_name[] = "pll3_48m_clk";

	struct clk *gpt_clk, *pclk;



	/* get the system timer clock */

	gpt_clk = clk_get_sys("gpt0", NULL);

	if (IS_ERR(gpt_clk)) {

		pr_err("%s:couldn't get clk for gpt\n", __func__);

		BUG();

	}



	/* get the suitable parent clock for timer*/

	pclk = clk_get(NULL, pclk_name);

	if (IS_ERR(pclk)) {

		pr_err("%s:couldn't get %s as parent for gpt\n",

				__func__, pclk_name);

		BUG();

	}



	clk_set_parent(gpt_clk, pclk);

	clk_put(gpt_clk);

	clk_put(pclk);



	spear_setup_timer();

}



struct sys_timer spear3xx_timer = {

	.init = spear3xx_timer_init,

};