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

Commit d3491820 authored by Simon Guinot's avatar Simon Guinot Committed by Nicolas Pitre
Browse files

[ARM] Kirkwood: fix timer initialization for LaCie boards 



Signed-off-by: default avatarSimon Guinot <sguinot@lacie.com>
Acked-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarNicolas Pitre <nico@fluxnic.net>
parent 2fa0f939

arch/arm/mach-kirkwood/d2net_v2-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -227,5 +227,5 @@ MACHINE_START(D2NET_V2, "LaCie d2 Network v2") 
	.init_machine	= d2net_v2_init,

	.map_io		= kirkwood_map_io,

	.init_irq	= kirkwood_init_irq,

	.timer		= &lacie_v2_timer,

	.timer		= &kirkwood_timer,

MACHINE_END

arch/arm/mach-kirkwood/lacie_v2-common.c

+0 −14
Original line number Diff line number Diff line
@@ -111,17 +111,3 @@ void __init lacie_v2_hdd_power_init(int hdd_num) 
			pr_err("Failed to power up HDD%d\n", i + 1);

	}

}
 


/*****************************************************************************

 * Timer

 ****************************************************************************/



static void lacie_v2_timer_init(void)

{

	kirkwood_tclk = 166666667;

	orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);

}



struct sys_timer lacie_v2_timer = {

	.init = lacie_v2_timer_init,

};

arch/arm/mach-kirkwood/lacie_v2-common.h

+0 −2
Original line number Diff line number Diff line
@@ -13,6 +13,4 @@ void lacie_v2_register_flash(void); 
void lacie_v2_register_i2c_devices(void);

void lacie_v2_hdd_power_init(int hdd_num);



extern struct sys_timer lacie_v2_timer;



#endif

arch/arm/mach-kirkwood/netspace_v2-setup.c

+3 −3
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ MACHINE_START(NETSPACE_V2, "LaCie Network Space v2") 
	.init_machine	= netspace_v2_init,

	.map_io		= kirkwood_map_io,

	.init_irq	= kirkwood_init_irq,

	.timer		= &lacie_v2_timer,

	.timer		= &kirkwood_timer,

MACHINE_END

#endif
@@ -233,7 +233,7 @@ MACHINE_START(INETSPACE_V2, "LaCie Internet Space v2") 
	.init_machine	= netspace_v2_init,

	.map_io		= kirkwood_map_io,

	.init_irq	= kirkwood_init_irq,

	.timer		= &lacie_v2_timer,

	.timer		= &kirkwood_timer,

MACHINE_END

#endif
@@ -245,6 +245,6 @@ MACHINE_START(NETSPACE_MAX_V2, "LaCie Network Space Max v2") 
	.init_machine	= netspace_v2_init,

	.map_io		= kirkwood_map_io,

	.init_irq	= kirkwood_init_irq,

	.timer		= &lacie_v2_timer,

	.timer		= &kirkwood_timer,

MACHINE_END

#endif

arch/arm/mach-kirkwood/netxbig_v2-setup.c

+2 −2
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ MACHINE_START(NET2BIG_V2, "LaCie 2Big Network v2") 
	.init_machine	= netxbig_v2_init,

	.map_io		= kirkwood_map_io,

	.init_irq	= kirkwood_init_irq,

	.timer		= &lacie_v2_timer,

	.timer		= &kirkwood_timer,

MACHINE_END

#endif
@@ -417,6 +417,6 @@ MACHINE_START(NET5BIG_V2, "LaCie 5Big Network v2") 
	.init_machine	= netxbig_v2_init,

	.map_io		= kirkwood_map_io,

	.init_irq	= kirkwood_init_irq,

	.timer		= &lacie_v2_timer,

	.timer		= &kirkwood_timer,

MACHINE_END

#endif