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

Commit 4ee1f6b5 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Nicolas Pitre
Browse files

ARM: Remove dependency of plat-orion time code on mach directory includes. 



This patch makes the various mach dirs that use the plat-orion time
code pass in timer and bridge addresses explicitly, instead of having
plat-orion get those values by including a mach dir include file --
the latter mechanism is problematic if you want to support multiple
ARM platforms in the same kernel image.

Signed-off-by: default avatarLennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: default avatarNicolas Pitre <nico@fluxnic.net>
parent 40ff15a6

arch/arm/mach-dove/cm-a510.c

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ MACHINE_START(CM_A510, "Compulab CM-A510 Board") 
	.boot_params	= 0x00000100,

	.init_machine	= cm_a510_init,

	.map_io		= dove_map_io,

	.init_early	= dove_init_early,

	.init_irq	= dove_init_irq,

	.timer		= &dove_timer,

MACHINE_END

arch/arm/mach-dove/common.c

+7 −1
Original line number Diff line number Diff line
@@ -532,6 +532,11 @@ void __init dove_i2c_init(void) 
/*****************************************************************************

 * Time handling

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

void __init dove_init_early(void)

{

	orion_time_set_base(TIMER_VIRT_BASE);

}



static int get_tclk(void)

{

	/* use DOVE_RESET_SAMPLE_HI/LO to detect tclk */
@@ -540,7 +545,8 @@ static int get_tclk(void) 


static void dove_timer_init(void)

{

	orion_time_init(IRQ_DOVE_BRIDGE, get_tclk());

	orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,

			IRQ_DOVE_BRIDGE, get_tclk());

}



struct sys_timer dove_timer = {

arch/arm/mach-dove/common.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ extern struct mbus_dram_target_info dove_mbus_dram_info; 
 */

void dove_map_io(void);

void dove_init(void);

void dove_init_early(void);

void dove_init_irq(void);

void dove_setup_cpu_mbus(void);

void dove_ge00_init(struct mv643xx_eth_platform_data *eth_data);

arch/arm/mach-dove/dove-db-setup.c

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ MACHINE_START(DOVE_DB, "Marvell DB-MV88AP510-BP Development Board") 
	.boot_params	= 0x00000100,

	.init_machine	= dove_db_init,

	.map_io		= dove_map_io,

	.init_early	= dove_init_early,

	.init_irq	= dove_init_irq,

	.timer		= &dove_timer,

MACHINE_END

arch/arm/mach-dove/include/mach/bridge-regs.h

+0 −4
Original line number Diff line number Diff line
@@ -26,10 +26,6 @@ 
#define SYSTEM_SOFT_RESET	(BRIDGE_VIRT_BASE | 0x010c)

#define  SOFT_RESET		0x00000001



#define BRIDGE_CAUSE		(BRIDGE_VIRT_BASE | 0x0110)

#define BRIDGE_MASK		(BRIDGE_VIRT_BASE | 0x0114)

#define  BRIDGE_INT_TIMER0	0x0002

#define  BRIDGE_INT_TIMER1	0x0004

#define  BRIDGE_INT_TIMER1_CLR	(~0x0004)



#define IRQ_VIRT_BASE		(BRIDGE_VIRT_BASE | 0x0200)