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

Commit 8560a6cf authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

arm: Footbridge: Use common i8253 clockevent 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: John Stultz <john.stultz@linaro.org>
Link: http://lkml.kernel.org/r/20110609130622.241312122@linutronix.de
parent 2d02612f

arch/arm/mach-footbridge/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ menu "Footbridge Implementations" 
config ARCH_CATS

config ARCH_CATS

	bool "CATS"

	bool "CATS"

	select CLKSRC_I8253

	select CLKSRC_I8253

	select CLKEVT_I8253

	select FOOTBRIDGE_HOST

	select FOOTBRIDGE_HOST

	select ISA

	select ISA

	select ISA_DMA

	select ISA_DMA

arch/arm/mach-footbridge/isa-timer.c

+3 −52
Original line number Original line Diff line number Diff line
@@ -5,12 +5,10 @@ 
 *  Copyright (C) 1998 Phil Blundell

 *  Copyright (C) 1998 Phil Blundell

 */

 */

#include <linux/clockchips.h>

#include <linux/clockchips.h>

#include <linux/clocksource.h>

#include <linux/i8253.h>

#include <linux/i8253.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/io.h>

#include <linux/spinlock.h>

#include <linux/spinlock.h>

#include <linux/timex.h>

#include <linux/timex.h>
@@ -19,48 +17,6 @@ 




#include "common.h"

#include "common.h"





static void pit_set_mode(enum clock_event_mode mode,

	struct clock_event_device *evt)

{

	unsigned long flags;



	raw_local_irq_save(flags);



	switch (mode) {

	case CLOCK_EVT_MODE_PERIODIC:

		outb_p(0x34, PIT_MODE);

		outb_p(PIT_LATCH & 0xff, PIT_CH0);

		outb_p(PIT_LATCH >> 8, PIT_CH0);

		break;



	case CLOCK_EVT_MODE_SHUTDOWN:

	case CLOCK_EVT_MODE_UNUSED:

		outb_p(0x30, PIT_MODE);

		outb_p(0, PIT_CH0);

		outb_p(0, PIT_CH0);

		break;



	case CLOCK_EVT_MODE_ONESHOT:

	case CLOCK_EVT_MODE_RESUME:

		break;

	}

	local_irq_restore(flags);

}



static int pit_set_next_event(unsigned long delta,

	struct clock_event_device *evt)

{

	return 0;

}



static struct clock_event_device pit_ce = {

	.name		= "pit",

	.features	= CLOCK_EVT_FEAT_PERIODIC,

	.set_mode	= pit_set_mode,

	.set_next_event	= pit_set_next_event,

	.shift		= 32,

};



static irqreturn_t pit_timer_interrupt(int irq, void *dev_id)

static irqreturn_t pit_timer_interrupt(int irq, void *dev_id)

{

{

	struct clock_event_device *ce = dev_id;

	struct clock_event_device *ce = dev_id;
@@ -72,20 +28,15 @@ static struct irqaction pit_timer_irq = { 
	.name		= "pit",

	.name		= "pit",

	.handler	= pit_timer_interrupt,

	.handler	= pit_timer_interrupt,

	.flags		= IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,

	.flags		= IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,

	.dev_id		= &pit_ce,

	.dev_id		= &i8253_clockevent,

};

};





static void __init isa_timer_init(void)

static void __init isa_timer_init(void)

{

{

	pit_ce.cpumask = cpumask_of(smp_processor_id());

	pit_ce.mult = div_sc(PIT_TICK_RATE, NSEC_PER_SEC, pit_ce.shift);

	pit_ce.max_delta_ns = clockevent_delta2ns(0x7fff, &pit_ce);

	pit_ce.min_delta_ns = clockevent_delta2ns(0x000f, &pit_ce);



	clocksource_i8253_init();

	clocksource_i8253_init();





	setup_irq(pit_ce.irq, &pit_timer_irq);

	setup_irq(i8253_clockevent.irq, &pit_timer_irq);

	clockevents_register_device(&pit_ce);

	clockevent_i8253_init(false);

}

}





struct sys_timer isa_timer = {

struct sys_timer isa_timer = {