---

yaml --- r: 36588 b: refs/heads/master c: 863753a h: refs/heads/master v: v3
git-mirror · Sep 25, 2006 · 8be342f · 8be342f
1 parent 04baa2e
commit 8be342f
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 266 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48388b2a56ae5e0f1c422e84d536f31729469b17
+refs/heads/master: 863753a81e4f863015be34900dc2ba3637622f34
diff --git a/trunk/arch/arm/mach-iop32x/Makefile b/trunk/arch/arm/mach-iop32x/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-obj-y			:= common.o setup.o irq.o time.o
+obj-y			:= common.o setup.o irq.o
 obj-m			:=
 obj-n			:=
 obj-			:=

diff --git a/trunk/arch/arm/mach-iop32x/setup.c b/trunk/arch/arm/mach-iop32x/setup.c
@@ -29,6 +29,7 @@
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <asm/mach/time.h>
 #include <asm/hardware/iop3xx.h>
 
 #define IOP321_UART_XTAL 1843200
@@ -67,16 +68,22 @@ void __init iop32x_init(void)
 
 #ifdef CONFIG_ARCH_IQ80321
 extern void iq80321_map_io(void);
-extern struct sys_timer iop321_timer;
-extern void iop321_init_time(void);
 #endif
 
 #ifdef CONFIG_ARCH_IQ31244
 extern void iq31244_map_io(void);
-extern struct sys_timer iop321_timer;
-extern void iop321_init_time(void);
 #endif
 
+static void __init iop3xx_timer_init(void)
+{
+	iop3xx_init_time(IOP321_TICK_RATE);
+}
+
+struct sys_timer iop321_timer = {
+	.init		= iop3xx_timer_init,
+	.offset		= iop3xx_gettimeoffset,
+};
+
 #if defined(CONFIG_ARCH_IQ80321)
 MACHINE_START(IQ80321, "Intel IQ80321")
 	/* Maintainer: Intel Corporation */

diff --git a/trunk/arch/arm/mach-iop32x/time.c b/trunk/arch/arm/mach-iop32x/time.c
diff --git a/trunk/arch/arm/mach-iop33x/Makefile b/trunk/arch/arm/mach-iop33x/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-obj-y			:= setup.o irq.o time.o
+obj-y			:= setup.o irq.o
 obj-m			:=
 obj-n			:=
 obj-			:=

diff --git a/trunk/arch/arm/mach-iop33x/setup.c b/trunk/arch/arm/mach-iop33x/setup.c
@@ -28,6 +28,7 @@
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <asm/mach/time.h>
 #include <asm/hardware/iop3xx.h>
 
 #define IOP331_UART_XTAL 33334000
@@ -118,9 +119,18 @@ void __init iop33x_init(void)
 
 #ifdef CONFIG_ARCH_IOP33X
 extern void iop331_init_irq(void);
-extern struct sys_timer iop331_timer;
 #endif
 
+static void __init iop3xx_timer_init(void)
+{
+	iop3xx_init_time(IOP331_TICK_RATE);
+}
+
+struct sys_timer iop331_timer = {
+	.init		= iop3xx_timer_init,
+	.offset		= iop3xx_gettimeoffset,
+};
+
 #if defined(CONFIG_ARCH_IQ80331)
 MACHINE_START(IQ80331, "Intel IQ80331")
 	/* Maintainer: Intel Corp. */

diff --git a/trunk/arch/arm/mach-iop33x/time.c b/trunk/arch/arm/mach-iop33x/time.c
diff --git a/trunk/include/asm-arm/arch-iop32x/iop321.h b/trunk/include/asm-arm/arch-iop32x/iop321.h
@@ -151,10 +151,6 @@
 #define IOP321_FINTSRC    (volatile u32 *)IOP321_REG_ADDR(0x000007DC)
 
 /* Timers */
-
-#define IOP321_TU_TMR0		(volatile u32 *)IOP321_REG_ADDR(0x000007E0)
-#define IOP321_TU_TMR1		(volatile u32 *)IOP321_REG_ADDR(0x000007E4)
-
 #ifdef CONFIG_ARCH_IQ80321
 #define	IOP321_TICK_RATE	200000000	/* 200 MHz clock */
 #elif defined(CONFIG_ARCH_IQ31244)
@@ -166,23 +162,6 @@
 #define IOP321_TICK_RATE 200000000 /* 33.333333 Mhz crystal */
 #endif
 
-#define IOP321_TMR_TC		0x01
-#define	IOP321_TMR_EN		0x02
-#define IOP321_TMR_RELOAD	0x04
-#define	IOP321_TMR_PRIVILEGED	0x09
-
-#define	IOP321_TMR_RATIO_1_1	0x00
-#define	IOP321_TMR_RATIO_4_1	0x10
-#define	IOP321_TMR_RATIO_8_1	0x20
-#define	IOP321_TMR_RATIO_16_1	0x30
-
-#define IOP321_TU_TCR0    (volatile u32 *)IOP321_REG_ADDR(0x000007E8)
-#define IOP321_TU_TCR1    (volatile u32 *)IOP321_REG_ADDR(0x000007EC)
-#define IOP321_TU_TRR0    (volatile u32 *)IOP321_REG_ADDR(0x000007F0)
-#define IOP321_TU_TRR1    (volatile u32 *)IOP321_REG_ADDR(0x000007F4)
-#define IOP321_TU_TISR    (volatile u32 *)IOP321_REG_ADDR(0x000007F8)
-#define IOP321_TU_WDTCR   (volatile u32 *)IOP321_REG_ADDR(0x000007FC)
-
 /* Application accelerator unit 0x00000800 - 0x000008FF */
 #define IOP321_AAU_ACR     (volatile u32 *)IOP321_REG_ADDR(0x00000800)
 #define IOP321_AAU_ASR     (volatile u32 *)IOP321_REG_ADDR(0x00000804)

diff --git a/trunk/include/asm-arm/arch-iop32x/timex.h b/trunk/include/asm-arm/arch-iop32x/timex.h
@@ -5,4 +5,4 @@
  */
 #include <asm/hardware.h>
 
-#define CLOCK_TICK_RATE IOP321_TICK_RATE
+#define CLOCK_TICK_RATE		(100 * HZ)
diff --git a/trunk/include/asm-arm/arch-iop33x/iop331.h b/trunk/include/asm-arm/arch-iop33x/iop331.h
@@ -137,27 +137,6 @@
 
 
 /* Timers */
-
-#define IOP331_TU_TMR0		(volatile u32 *)IOP331_REG_ADDR(0x000007D0)
-#define IOP331_TU_TMR1		(volatile u32 *)IOP331_REG_ADDR(0x000007D4)
-
-#define IOP331_TMR_TC		0x01
-#define	IOP331_TMR_EN		0x02
-#define IOP331_TMR_RELOAD	0x04
-#define	IOP331_TMR_PRIVILEGED	0x09
-
-#define	IOP331_TMR_RATIO_1_1	0x00
-#define	IOP331_TMR_RATIO_4_1	0x10
-#define	IOP331_TMR_RATIO_8_1	0x20
-#define	IOP331_TMR_RATIO_16_1	0x30
-
-#define IOP331_TU_TCR0    (volatile u32 *)IOP331_REG_ADDR(0x000007D8)
-#define IOP331_TU_TCR1    (volatile u32 *)IOP331_REG_ADDR(0x000007DC)
-#define IOP331_TU_TRR0    (volatile u32 *)IOP331_REG_ADDR(0x000007E0)
-#define IOP331_TU_TRR1    (volatile u32 *)IOP331_REG_ADDR(0x000007E4)
-#define IOP331_TU_TISR    (volatile u32 *)IOP331_REG_ADDR(0x000007E8)
-#define IOP331_TU_WDTCR   (volatile u32 *)IOP331_REG_ADDR(0x000007EC)
-
 #if defined(CONFIG_ARCH_IOP33X)
 #define	IOP331_TICK_RATE	266000000	/* 266 MHz IB clock */
 #endif

diff --git a/trunk/include/asm-arm/arch-iop33x/timex.h b/trunk/include/asm-arm/arch-iop33x/timex.h
@@ -5,4 +5,4 @@
  */
 #include <asm/hardware.h>
 
-#define CLOCK_TICK_RATE IOP331_TICK_RATE
+#define CLOCK_TICK_RATE		(100 * HZ)