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

Commit f2ef412d authored by Sivaram Nair's avatar Sivaram Nair Committed by Stephen Warren
Browse files

ARM: tegra: rename tegra system timer 



The timer variable is renamed to avoid confusion and symbol name clash
with the tegra_timer clock.

Signed-off-by: default avatarSivaram Nair <sivaramn@nvidia.com>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 78662130

arch/arm/mach-tegra/board-dt-tegra20.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)") 
	.init_early	= tegra20_init_early,

	.init_irq	= tegra_dt_init_irq,

	.handle_irq	= gic_handle_irq,

	.timer		= &tegra_timer,

	.timer		= &tegra_sys_timer,

	.init_machine	= tegra_dt_init,

	.init_late	= tegra_dt_init_late,

	.restart	= tegra_assert_system_reset,

arch/arm/mach-tegra/board-dt-tegra30.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ DT_MACHINE_START(TEGRA30_DT, "NVIDIA Tegra30 (Flattened Device Tree)") 
	.init_early	= tegra30_init_early,

	.init_irq	= tegra_dt_init_irq,

	.handle_irq	= gic_handle_irq,

	.timer		= &tegra_timer,

	.timer		= &tegra_sys_timer,

	.init_machine	= tegra30_dt_init,

	.init_late	= tegra_init_late,

	.restart	= tegra_assert_system_reset,

arch/arm/mach-tegra/board.h

+1 −1
Original line number Diff line number Diff line
@@ -55,5 +55,5 @@ static inline int harmony_pcie_init(void) { return 0; } 


void __init tegra_paz00_wifikill_init(void);



extern struct sys_timer tegra_timer;

extern struct sys_timer tegra_sys_timer;

#endif

arch/arm/mach-tegra/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static void __init tegra_init_timer(void) 
	register_persistent_clock(NULL, tegra_read_persistent_clock);

}



struct sys_timer tegra_timer = {

struct sys_timer tegra_sys_timer = {

	.init = tegra_init_timer,

};