Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-11 15:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] m68knommu: read/write register access for PIT timer

Browse Source 
Modify the m68knommu/ColdFire PIT timer code to use register offsets
with raw_read/raw_write access, instead of a mapped struct.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Greg Ungerer 2006-06-26 10:33:10 +10:00 committed by Linus Torvalds
parent 2082b477dc
commit b671b653da
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
arch/m68knommu/platform/5307/pit.c
View File

@ -1,11 +1,11 @@
/***************************************************************************/ /***************************************************************************/
/* /*
* pit.c -- Motorola ColdFire PIT timer. Currently this type of * pit.c -- Freescale ColdFire PIT timer. Currently this type of
* hardware timer only exists in the Motorola ColdFire * hardware timer only exists in the Freescale ColdFire
* 5270/5271, 5282 and other CPUs. * 5270/5271, 5282 and other CPUs.
* *
* Copyright (C) 1999-2004, Greg Ungerer (gerg@snapgear.com) * Copyright (C) 1999-2006, Greg Ungerer (gerg@snapgear.com)
* Copyright (C) 2001-2004, SnapGear Inc. (www.snapgear.com) * Copyright (C) 2001-2004, SnapGear Inc. (www.snapgear.com)
* *
*/ */
@ -18,6 +18,7 @@
#include <linux/param.h> #include <linux/param.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/coldfire.h> #include <asm/coldfire.h>
#include <asm/mcfpit.h> #include <asm/mcfpit.h>
@ -25,13 +26,20 @@
/***************************************************************************/ /***************************************************************************/
/*
* By default use timer1 as the system clock timer.
*/
#define TA(a) (MCF_IPSBAR + MCFPIT_BASE1 + (a))
/***************************************************************************/
void coldfire_pit_tick(void) void coldfire_pit_tick(void)
{ {
volatile struct mcfpit *tp; unsigned short pcsr;
/* Reset the ColdFire timer */ /* Reset the ColdFire timer */
tp = (volatile struct mcfpit *) (MCF_IPSBAR + MCFPIT_BASE1); pcsr = __raw_readw(TA(MCFPIT_PCSR));
tp->pcsr |= MCFPIT_PCSR_PIF; __raw_writew(pcsr | MCFPIT_PCSR_PIF, TA(MCFPIT_PCSR));
} }
/***************************************************************************/ /***************************************************************************/
@ -40,7 +48,6 @@ void coldfire_pit_init(irqreturn_t (*handler)(int, void *, struct pt_regs *))
{ {
volatile unsigned char *icrp; volatile unsigned char *icrp;
volatile unsigned long *imrp; volatile unsigned long *imrp;
volatile struct mcfpit *tp;
request_irq(MCFINT_VECBASE + MCFINT_PIT1, handler, SA_INTERRUPT, request_irq(MCFINT_VECBASE + MCFINT_PIT1, handler, SA_INTERRUPT,
"ColdFire Timer", NULL); "ColdFire Timer", NULL);
@ -53,27 +60,23 @@ void coldfire_pit_init(irqreturn_t (*handler)(int, void *, struct pt_regs *))
*imrp &= ~MCFPIT_IMR_IBIT; *imrp &= ~MCFPIT_IMR_IBIT;
/* Set up PIT timer 1 as poll clock */ /* Set up PIT timer 1 as poll clock */
tp = (volatile struct mcfpit *) (MCF_IPSBAR + MCFPIT_BASE1); __raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR));
tp->pcsr = MCFPIT_PCSR_DISABLE; __raw_writew(((MCF_CLK / 2) / 64) / HZ, TA(MCFPIT_PMR));
__raw_writew(MCFPIT_PCSR_EN | MCFPIT_PCSR_PIE | MCFPIT_PCSR_OVW |
tp->pmr = ((MCF_CLK / 2) / 64) / HZ; MCFPIT_PCSR_RLD | MCFPIT_PCSR_CLK64, TA(MCFPIT_PCSR));
tp->pcsr = MCFPIT_PCSR_EN | MCFPIT_PCSR_PIE | MCFPIT_PCSR_OVW |
MCFPIT_PCSR_RLD | MCFPIT_PCSR_CLK64;
} }
/***************************************************************************/ /***************************************************************************/
unsigned long coldfire_pit_offset(void) unsigned long coldfire_pit_offset(void)
{ {
volatile struct mcfpit *tp;
volatile unsigned long *ipr; volatile unsigned long *ipr;
unsigned long pmr, pcntr, offset; unsigned long pmr, pcntr, offset;
tp = (volatile struct mcfpit *) (MCF_IPSBAR + MCFPIT_BASE1);
ipr = (volatile unsigned long *) (MCF_IPSBAR + MCFICM_INTC0 + MCFPIT_IMR); ipr = (volatile unsigned long *) (MCF_IPSBAR + MCFICM_INTC0 + MCFPIT_IMR);
pmr = *(&tp->pmr); pmr = __raw_readw(TA(MCFPIT_PMR));
pcntr = *(&tp->pcntr); pcntr = __raw_readw(TA(MCFPIT_PCNTR));
/* /*
* If we are still in the first half of the upcount and a * If we are still in the first half of the upcount and a

8
include/asm-m68knommu/mcfpit.h
View File

@ -28,11 +28,9 @@
/* /*
* Define the PIT timer register set addresses. * Define the PIT timer register set addresses.
*/ */
struct mcfpit { #define MCFPIT_PCSR 0x0 /* PIT control register */
unsigned short pcsr; /* PIT control and status */ #define MCFPIT_PMR 0x2 /* PIT modulus register */
unsigned short pmr; /* PIT modulus register */ #define MCFPIT_PCNTR 0x4 /* PIT count register */
unsigned short pcntr; /* PIT count register */
} __attribute__((packed));
/* /*
* Bit definitions for the PIT Control and Status register. * Bit definitions for the PIT Control and Status register.