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

Commit 39e823e3 authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

[ARM] 4821/1: RealView: Remove the platform dependencies from localtimer.c 



This patch removes the TWD_BASE macro used to set up and configure the
local timers on ARM11MPCore. The twd_base_addr and twd_size variables
are defined in localtimer.c and set from the realview_eb_init function.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8cc4c548

arch/arm/mach-realview/core.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,10 @@ extern struct mmc_platform_data realview_mmc1_plat_data; 
extern struct clk realview_clcd_clk;

extern struct clk realview_clcd_clk;

extern struct clcd_board clcd_plat_data;

extern struct clcd_board clcd_plat_data;

extern void __iomem *gic_cpu_base_addr;

extern void __iomem *gic_cpu_base_addr;

#ifdef CONFIG_LOCAL_TIMERS

extern void __iomem *twd_base_addr;

extern unsigned int twd_size;

#endif





extern void realview_leds_event(led_event_t ledevt);

extern void realview_leds_event(led_event_t ledevt);

extern void realview_timer_init(unsigned int timer_irq);

extern void realview_timer_init(unsigned int timer_irq);

arch/arm/mach-realview/localtimer.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -24,9 +24,6 @@ 
#include <asm/io.h>

#include <asm/io.h>

#include <asm/irq.h>

#include <asm/irq.h>





#define TWD_BASE(cpu)	(__io_address(REALVIEW_EB11MP_TWD_BASE) + \

			 ((cpu) * REALVIEW_EB11MP_TWD_SIZE))



static DEFINE_PER_CPU(struct clock_event_device, local_clockevent);

static DEFINE_PER_CPU(struct clock_event_device, local_clockevent);





/*

/*
@@ -41,6 +38,12 @@ void local_timer_interrupt(void) 




#ifdef CONFIG_LOCAL_TIMERS

#ifdef CONFIG_LOCAL_TIMERS





#define TWD_BASE(cpu)	(twd_base_addr + (cpu) * twd_size)



/* set up by the platform code */

void __iomem *twd_base_addr;

unsigned int twd_size;



static unsigned long mpcore_timer_rate;

static unsigned long mpcore_timer_rate;





static void local_timer_set_mode(enum clock_event_mode mode,

static void local_timer_set_mode(enum clock_event_mode mode,

arch/arm/mach-realview/realview_eb.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -309,9 +309,13 @@ static void __init realview_eb_timer_init(void) 
{

{

	unsigned int timer_irq;

	unsigned int timer_irq;





	if (core_tile_eb11mp())

	if (core_tile_eb11mp()) {

#ifdef CONFIG_LOCAL_TIMERS

		twd_base_addr = __io_address(REALVIEW_EB11MP_TWD_BASE);

		twd_size = REALVIEW_EB11MP_TWD_SIZE;

#endif

		timer_irq = IRQ_EB11MP_TIMER0_1;

		timer_irq = IRQ_EB11MP_TIMER0_1;

	else

	} else

		timer_irq = IRQ_EB_TIMER0_1;

		timer_irq = IRQ_EB_TIMER0_1;





	realview_timer_init(timer_irq);

	realview_timer_init(timer_irq);