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

Commit 6f82e25d authored by Felipe Balbi's avatar Felipe Balbi
Browse files

arm: omap2: timer: rename omap_sync32k_timer_init() 



this function is not only about the 32k sync
timer, it's OMAP's generic init_time implementation.

Let's rename it to make that detail easier to
notice.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 9c46ffcd

arch/arm/mach-omap2/board-generic.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)") 
	.map_io		= omap242x_map_io,

	.map_io		= omap242x_map_io,

	.init_early	= omap2420_init_early,

	.init_early	= omap2420_init_early,

	.init_machine	= omap_generic_init,

	.init_machine	= omap_generic_init,

	.init_time	= omap_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= omap242x_boards_compat,

	.dt_compat	= omap242x_boards_compat,

	.restart	= omap2xxx_restart,

	.restart	= omap2xxx_restart,

MACHINE_END

MACHINE_END
@@ -63,7 +63,7 @@ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)") 
	.map_io		= omap243x_map_io,

	.map_io		= omap243x_map_io,

	.init_early	= omap2430_init_early,

	.init_early	= omap2430_init_early,

	.init_machine	= omap_generic_init,

	.init_machine	= omap_generic_init,

	.init_time	= omap_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= omap243x_boards_compat,

	.dt_compat	= omap243x_boards_compat,

	.restart	= omap2xxx_restart,

	.restart	= omap2xxx_restart,

MACHINE_END

MACHINE_END
@@ -82,7 +82,7 @@ DT_MACHINE_START(OMAP3_N900_DT, "Nokia RX-51 board") 
	.init_early	= omap3430_init_early,

	.init_early	= omap3430_init_early,

	.init_machine	= omap_generic_init,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_late	= omap3_init_late,

	.init_time	= omap_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= n900_boards_compat,

	.dt_compat	= n900_boards_compat,

	.restart	= omap3xxx_restart,

	.restart	= omap3xxx_restart,

MACHINE_END

MACHINE_END
@@ -100,7 +100,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") 
	.init_early	= omap3430_init_early,

	.init_early	= omap3430_init_early,

	.init_machine	= omap_generic_init,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_late	= omap3_init_late,

	.init_time	= omap_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= omap3_boards_compat,

	.dt_compat	= omap3_boards_compat,

	.restart	= omap3xxx_restart,

	.restart	= omap3xxx_restart,

MACHINE_END

MACHINE_END
@@ -116,7 +116,7 @@ DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)") 
	.init_early	= omap3630_init_early,

	.init_early	= omap3630_init_early,

	.init_machine	= omap_generic_init,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_late	= omap3_init_late,

	.init_time	= omap_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= omap36xx_boards_compat,

	.dt_compat	= omap36xx_boards_compat,

	.restart	= omap3xxx_restart,

	.restart	= omap3xxx_restart,

MACHINE_END

MACHINE_END

arch/arm/mach-omap2/board-ldp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -424,6 +424,6 @@ MACHINE_START(OMAP_LDP, "OMAP LDP board") 
	.init_irq	= omap3_init_irq,

	.init_irq	= omap3_init_irq,

	.init_machine	= omap_ldp_init,

	.init_machine	= omap_ldp_init,

	.init_late	= omap3430_init_late,

	.init_late	= omap3430_init_late,

	.init_time	= omap_sync32k_timer_init,

	.init_time	= omap_init_time,

	.restart	= omap3xxx_restart,

	.restart	= omap3xxx_restart,

MACHINE_END
 
MACHINE_END

arch/arm/mach-omap2/board-rx51.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -136,6 +136,6 @@ MACHINE_START(NOKIA_RX51, "Nokia RX-51 board") 
	.init_irq	= omap3_init_irq,

	.init_irq	= omap3_init_irq,

	.init_machine	= rx51_init,

	.init_machine	= rx51_init,

	.init_late	= omap3430_init_late,

	.init_late	= omap3430_init_late,

	.init_time	= omap_sync32k_timer_init,

	.init_time	= omap_init_time,

	.restart	= omap3xxx_restart,

	.restart	= omap3xxx_restart,

MACHINE_END
 
MACHINE_END

arch/arm/mach-omap2/common.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ static inline int omap_mux_late_init(void) 




extern void omap2_init_common_infrastructure(void);

extern void omap2_init_common_infrastructure(void);





extern void omap_sync32k_timer_init(void);

extern void omap_init_time(void);

extern void omap3_secure_sync32k_timer_init(void);

extern void omap3_secure_sync32k_timer_init(void);

extern void omap3_gptimer_timer_init(void);

extern void omap3_gptimer_timer_init(void);

extern void omap4_local_timer_init(void);

extern void omap4_local_timer_init(void);

arch/arm/mach-omap2/timer.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -492,7 +492,7 @@ static void __init __omap_sync32k_timer_init(int clkev_nr, const char *clkev_src 
		omap2_sync32k_clocksource_init();

		omap2_sync32k_clocksource_init();

}

}





void __init omap_sync32k_timer_init(void)

void __init omap_init_time(void)

{

{

	__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",

	__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",

			2, "timer_sys_ck", NULL, false);

			2, "timer_sys_ck", NULL, false);