Seperate old structure defines and new structure defines

New timer structure and defines will move to new timer.h

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>

diff --git a/include/asm-m68k/mcftimer.h b/include/asm-m68k/mcftimer.h
index 988860d07f52b0cd4c1455b350d7518e709a366f..381f4eb8e7300f78fc204a9bc653e979204452a9 100644 (file)
--- a/include/asm-m68k/mcftimer.h
+++ b/include/asm-m68k/mcftimer.h
@@ -107,77 +107,5 @@
 #define MCFTIMER_PCSR_HALTED   0x0020
 #define MCFTIMER_PCSR_DOZE     0x0040
 
-/****************************************************************************/
-/* New Timer structure */
-/****************************************************************************/
-/* DMA Timer module registers */
-typedef struct dtimer_ctrl {
-       u16 tmr;                /* 0x00 Mode register */
-       u8 txmr;                /* 0x02 Extended Mode register */
-       u8 ter;                 /* 0x03 Event register */
-       u32 trr;                /* 0x04 Reference register */
-       u32 tcr;                /* 0x08 Capture register */
-       u32 tcn;                /* 0x0C Counter register */
-} dtmr_t;
-
-/*Programmable Interrupt Timer */
-typedef struct pit_ctrl {
-       u16 pcsr;               /* 0x00 Control and Status Register */
-       u16 pmr;                /* 0x02 Modulus Register */
-       u16 pcntr;              /* 0x04 Count Register */
-} pit_t;
-
-/*********************************************************************
-* DMA Timers (DTIM)
-*********************************************************************/
-/* Bit definitions and macros for DTMR */
-#define DTIM_DTMR_RST          (0x0001)        /* Reset */
-#define DTIM_DTMR_CLK(x)       (((x)&0x0003)<<1)       /* Input clock source */
-#define DTIM_DTMR_FRR          (0x0008)        /* Free run/restart */
-#define DTIM_DTMR_ORRI         (0x0010)        /* Output reference request/interrupt enable */
-#define DTIM_DTMR_OM           (0x0020)        /* Output Mode */
-#define DTIM_DTMR_CE(x)                (((x)&0x0003)<<6)       /* Capture Edge */
-#define DTIM_DTMR_PS(x)                (((x)&0x00FF)<<8)       /* Prescaler value */
-#define DTIM_DTMR_RST_EN       (0x0001)
-#define DTIM_DTMR_RST_RST      (0x0000)
-#define DTIM_DTMR_CE_ANY       (0x00C0)
-#define DTIM_DTMR_CE_FALL      (0x0080)
-#define DTIM_DTMR_CE_RISE      (0x0040)
-#define DTIM_DTMR_CE_NONE      (0x0000)
-#define DTIM_DTMR_CLK_DTIN     (0x0006)
-#define DTIM_DTMR_CLK_DIV16    (0x0004)
-#define DTIM_DTMR_CLK_DIV1     (0x0002)
-#define DTIM_DTMR_CLK_STOP     (0x0000)
-
-/* Bit definitions and macros for DTXMR */
-#define DTIM_DTXMR_MODE16      (0x01)  /* Increment Mode */
-#define DTIM_DTXMR_DMAEN       (0x80)  /* DMA request */
-
-/* Bit definitions and macros for DTER */
-#define DTIM_DTER_CAP          (0x01)  /* Capture event */
-#define DTIM_DTER_REF          (0x02)  /* Output reference event */
-
-/*********************************************************************
-*
-* Programmable Interrupt Timer Modules (PIT)
-*
-*********************************************************************/
-
-/* Bit definitions and macros for PCSR */
-#define PIT_PCSR_EN            (0x0001)
-#define PIT_PCSR_RLD           (0x0002)
-#define PIT_PCSR_PIF           (0x0004)
-#define PIT_PCSR_PIE           (0x0008)
-#define PIT_PCSR_OVW           (0x0010)
-#define PIT_PCSR_HALTED                (0x0020)
-#define PIT_PCSR_DOZE          (0x0040)
-#define PIT_PCSR_PRE(x)                (((x)&0x000F)<<8)
-
-/* Bit definitions and macros for PMR */
-#define PIT_PMR_PM(x)          (x)
-
-/* Bit definitions and macros for PCNTR */
-#define PIT_PCNTR_PC(x)                (x)
-
 /****************************************************************************/
 #endif                         /* mcftimer_h */