linux-mips
[Top] [All Lists]

[patch] pnx8xxx clocksource cleanups

To: ralf@linux-mips.org, sshtylyov@ru.mvista.com
Subject: [patch] pnx8xxx clocksource cleanups
From: Vitaly Wool <vitalywool@gmail.com>
Date: Sat, 12 Jan 2008 16:03:40 +0300
Cc: linux-mips@linux-mips.org
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:user-agent:mime-version:to:cc:subject:content-type:content-transfer-encoding; bh=M9oxPAlivF3jWDRHCrrFn63SdHADbAElvwq/a/06cE4=; b=bE1HQ1EZhDWOoVOf96/05z8nFDdTRSMn9sGo4aFQbnTbEw9i73pxpqfjNQzS4iOsWPeUEgRICHQQhmTbxYwZZlSXRt7vY5vgIbQzDB14nsvSh6FvUhXH4ZWN5+ZTLHRejfNHuMKCMlBCsCn7AsyoRYdKRsTWiwEB6TILdqeoR94=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject:content-type:content-transfer-encoding; b=BEULqgzGrEmJy6STuv/qXMd4HUNRB4LVEGrHsieMsw8gPVG6vimOPgWQtrPh+Rd9KUgWobCLk8zd2UyYg5kYaT8esELKLjO8s6LHLgi9qUS441lr9q8yqnwSfAJisKLaESEnWYBKLkEzusNXHwBOzkMjD6bt+4oLaFEKgXz5eV0=
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Icedove 1.5.0.12 (X11/20070607)
This patch does some PNX8XXX clocksource cleanups.

arch/mips/philips/pnx8550/common/time.c |   35 ++++++++++----------------------
1 file changed, 11 insertions(+), 24 deletions(-)

Signed-off-by: Vitaly Wool <vitalywool@gmail.com>

Index: linux-mips.git/arch/mips/philips/pnx8550/common/time.c
===================================================================
--- linux-mips.git.orig/arch/mips/philips/pnx8550/common/time.c
+++ linux-mips.git/arch/mips/philips/pnx8550/common/time.c
@@ -47,11 +47,6 @@ static struct clocksource pnx_clocksourc
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
};

-static void timer_ack(void)
-{
-       write_c0_compare(cpj);
-}
-
static irqreturn_t pnx8xxx_timer_interrupt(int irq, void *dev_id)
{
        struct clock_event_device *c = dev_id;
@@ -94,30 +89,22 @@ static struct clock_event_device pnx8xxx
        .set_next_event = pnx8xxx_set_next_event,
};

-/*
- * plat_time_init() - it does the following things:
- *
- * 1) plat_time_init() -
- *     a) (optional) set up RTC routines,
- *      b) (optional) calibrate and set the mips_hpt_frequency
- *         (only needed if you intended to use cpu counter as timer interrupt
- *          source)
- */
+static inline void timer_ack(void)
+{
+       write_c0_compare(cpj);
+}

__init void plat_time_init(void)
{
-       unsigned int             configPR;
-       unsigned int             n;
-       unsigned int             m;
-       unsigned int             p;
-       unsigned int             pow2p;
+       unsigned int configPR;
+       unsigned int n;
+       unsigned int m;
+       unsigned int p;
+       unsigned int pow2p;

        clockevents_register_device(&pnx8xxx_clockevent);
        clocksource_register(&pnx_clocksource);

-       setup_irq(PNX8550_INT_TIMER1, &pnx8xxx_timer_irq);
-       setup_irq(PNX8550_INT_TIMER2, &monotonic_irqaction);
-
        /* Timer 1 start */
        configPR = read_c0_config7();
        configPR &= ~0x00000008;
@@ -158,6 +145,6 @@ __init void plat_time_init(void)
        write_c0_count2(0);
        write_c0_compare2(0xffffffff);

+       setup_irq(PNX8550_INT_TIMER1, &pnx8xxx_timer_irq);
+       setup_irq(PNX8550_INT_TIMER2, &monotonic_irqaction);
}
-
-


<Prev in Thread] Current Thread [Next in Thread>