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

Commit 7c380f27 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

ARM: plat-versatile: convert to twd_local_timer_register() interface 



Add support for the new smp_twd runtime registration interface
to the RealView/VE platforms, and remove the old compile-time support.
Tested on EB11MP.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent a45c983f

arch/arm/mach-realview/realview_eb.c

+21 −6
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <asm/pgtable.h>

#include <asm/hardware/gic.h>

#include <asm/hardware/cache-l2x0.h>

#include <asm/localtimer.h>

#include <asm/smp_twd.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -383,6 +383,23 @@ static void realview_eb11mp_fixup(void) 
	realview_eb_isp1761_resources[1].end	= IRQ_EB11MP_USB;

}



#ifdef CONFIG_HAVE_ARM_TWD

static DEFINE_TWD_LOCAL_TIMER(twd_local_timer,

			      REALVIEW_EB11MP_TWD_BASE,

			      IRQ_LOCALTIMER);



static void __init realview_eb_twd_init(void)

{

	if (core_tile_eb11mp() || core_tile_a9mp()) {

		int err = twd_local_timer_register(&twd_local_timer);

		if (err)

			pr_err("twd_local_timer_register failed %d\n", err);

	}

}

#else

#define realview_eb_twd_init()	do { } while(0)

#endif



static void __init realview_eb_timer_init(void)

{

	unsigned int timer_irq;
@@ -392,15 +409,13 @@ static void __init realview_eb_timer_init(void) 
	timer2_va_base = __io_address(REALVIEW_EB_TIMER2_3_BASE);

	timer3_va_base = __io_address(REALVIEW_EB_TIMER2_3_BASE) + 0x20;



	if (core_tile_eb11mp() || core_tile_a9mp()) {

#ifdef CONFIG_LOCAL_TIMERS

		twd_base = __io_address(REALVIEW_EB11MP_TWD_BASE);

#endif

	if (core_tile_eb11mp() || core_tile_a9mp())

		timer_irq = IRQ_EB11MP_TIMER0_1;

	} else

	else

		timer_irq = IRQ_EB_TIMER0_1;



	realview_timer_init(timer_irq);

	realview_eb_twd_init();

}



static struct sys_timer realview_eb_timer = {

arch/arm/mach-realview/realview_pb11mp.c

+17 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <asm/pgtable.h>

#include <asm/hardware/gic.h>

#include <asm/hardware/cache-l2x0.h>

#include <asm/localtimer.h>

#include <asm/smp_twd.h>



#include <asm/mach/arch.h>

#include <asm/mach/flash.h>
@@ -290,6 +290,21 @@ static void __init gic_init_irq(void) 
	gic_cascade_irq(1, IRQ_TC11MP_PB_IRQ1);

}



#ifdef CONFIG_HAVE_ARM_TWD

static DEFINE_TWD_LOCAL_TIMER(twd_local_timer,

			      REALVIEW_TC11MP_TWD_BASE,

			      IRQ_LOCALTIMER);



static void __init realview_pb11mp_twd_init(void)

{

	int err = twd_local_timer_register(&twd_local_timer);

	if (err)

		pr_err("twd_local_timer_register failed %d\n", err);

}

#else

#define realview_pb11mp_twd_init()	do {} while(0)

#endif



static void __init realview_pb11mp_timer_init(void)

{

	timer0_va_base = __io_address(REALVIEW_PB11MP_TIMER0_1_BASE);
@@ -297,10 +312,8 @@ static void __init realview_pb11mp_timer_init(void) 
	timer2_va_base = __io_address(REALVIEW_PB11MP_TIMER2_3_BASE);

	timer3_va_base = __io_address(REALVIEW_PB11MP_TIMER2_3_BASE) + 0x20;



#ifdef CONFIG_LOCAL_TIMERS

	twd_base = __io_address(REALVIEW_TC11MP_TWD_BASE);

#endif

	realview_timer_init(IRQ_TC11MP_TIMER0_1);

	realview_pb11mp_twd_init();

}



static struct sys_timer realview_pb11mp_timer = {

arch/arm/mach-realview/realview_pbx.c

+16 −4
Original line number Diff line number Diff line
@@ -298,6 +298,21 @@ static void __init gic_init_irq(void) 
	}

}



#ifdef CONFIG_HAVE_ARM_TWD

static DEFINE_TWD_LOCAL_TIMER(twd_local_timer,

			      REALVIEW_PBX_TILE_TWD_BASE,

			      IRQ_LOCALTIMER);



static void __init realview_pbx_twd_init(void)

{

	int err = twd_local_timer_register(&twd_local_timer);

	if (err)

		pr_err("twd_local_timer_register failed %d\n", err);

}

#else

#define realview_pbx_twd_init()	do { } while(0)

#endif



static void __init realview_pbx_timer_init(void)

{

	timer0_va_base = __io_address(REALVIEW_PBX_TIMER0_1_BASE);
@@ -305,11 +320,8 @@ static void __init realview_pbx_timer_init(void) 
	timer2_va_base = __io_address(REALVIEW_PBX_TIMER2_3_BASE);

	timer3_va_base = __io_address(REALVIEW_PBX_TIMER2_3_BASE) + 0x20;



#ifdef CONFIG_LOCAL_TIMERS

	if (core_tile_pbx11mp() || core_tile_pbxa9mp())

		twd_base = __io_address(REALVIEW_PBX_TILE_TWD_BASE);

#endif

	realview_timer_init(IRQ_PBX_TIMER0_1);

	realview_pbx_twd_init();

}



static struct sys_timer realview_pbx_timer = {

arch/arm/mach-vexpress/ct-ca9x4.c

+14 −3
Original line number Diff line number Diff line
@@ -42,15 +42,26 @@ static struct map_desc ct_ca9x4_io_desc[] __initdata = { 
static void __init ct_ca9x4_map_io(void)

{

	iotable_init(ct_ca9x4_io_desc, ARRAY_SIZE(ct_ca9x4_io_desc));

#ifdef CONFIG_LOCAL_TIMERS

	twd_base = ioremap(A9_MPCORE_TWD, SZ_32);

#endif

}



#ifdef CONFIG_HAVE_ARM_TWD

static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, A9_MPCORE_TWD, IRQ_LOCALTIMER);



static void __init ca9x4_twd_init(void)

{

	int err = twd_local_timer_register(&twd_local_timer);

	if (err)

		pr_err("twd_local_timer_register failed %d\n", err);

}

#else

#define ca9x4_twd_init()	do {} while(0)

#endif



static void __init ct_ca9x4_init_irq(void)

{

	gic_init(0, 29, ioremap(A9_MPCORE_GIC_DIST, SZ_4K),

		 ioremap(A9_MPCORE_GIC_CPU, SZ_256));

	ca9x4_twd_init();

}



static void ct_ca9x4_clcd_enable(struct clcd_fb *fb)

arch/arm/plat-versatile/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-y	:= clock.o

obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o

obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o

obj-$(CONFIG_PLAT_VERSATILE_FPGA_IRQ) += fpga-irq.o

obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o