1 files changed, 0 insertions, 134 deletions
diff --git a/arch/arm/mach-pnx4008/time.c b/arch/arm/mach-pnx4008/time.c
deleted file mode 100644
index 0cfe8af3d3be..000000000000
--- a/arch/arm/mach-pnx4008/time.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * arch/arm/mach-pnx4008/time.c
- *
- * PNX4008 Timers
- *
- * Authors: Vitaly Wool, Dmitry Chigirev, Grigory Tolstolytkin <source@mvista.com>
- *
- * 2005 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <linux/module.h>
-#include <linux/kallsyms.h>
-#include <linux/time.h>
-#include <linux/timex.h>
-#include <linux/irq.h>
-#include <linux/io.h>
-#include <mach/hardware.h>
-#include <asm/leds.h>
-#include <asm/mach/time.h>
-#include <asm/errno.h>
-#include "time.h"
-/*! Note: all timers are UPCOUNTING */
-/*!
- * Returns number of us since last clock interrupt.  Note that interrupts
- * will have been disabled by do_gettimeoffset()
- */
-static unsigned long pnx4008_gettimeoffset(void)
-{
-        u32 ticks_to_match =
-            __raw_readl(HSTIM_MATCH0) - __raw_readl(HSTIM_COUNTER);
-        u32 elapsed = LATCH - ticks_to_match;
-        return (elapsed * (tick_nsec / 1000)) / LATCH;
-}
-/*!
- * IRQ handler for the timer
- */
-static irqreturn_t pnx4008_timer_interrupt(int irq, void *dev_id)
-{
-        if (__raw_readl(HSTIM_INT) & MATCH0_INT) {
-                do {
-                        timer_tick();
-                        /*
-                         * this algorithm takes care of possible delay
-                         * for this interrupt handling longer than a normal
-                         * timer period
-                         */
-                        __raw_writel(__raw_readl(HSTIM_MATCH0) + LATCH,
-                                     HSTIM_MATCH0);
-                        __raw_writel(MATCH0_INT, HSTIM_INT);    /* clear interrupt */
-                        /*
-                         * The goal is to keep incrementing HSTIM_MATCH0
-                         * register until HSTIM_MATCH0 indicates time after
-                         * what HSTIM_COUNTER indicates.
-                         */
-                } while ((signed)
-                         (__raw_readl(HSTIM_MATCH0) -
-                          __raw_readl(HSTIM_COUNTER)) < 0);
-        }
-        return IRQ_HANDLED;
-}
-static struct irqaction pnx4008_timer_irq = {
-        .name = "PNX4008 Tick Timer",
-        .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
-        .handler = pnx4008_timer_interrupt
-};
-/*!
- * Set up timer and timer interrupt.
- */
-static __init void pnx4008_setup_timer(void)
-{
-        __raw_writel(RESET_COUNT, MSTIM_CTRL);
-        while (__raw_readl(MSTIM_COUNTER)) ;    /* wait for reset to complete. 100% guarantee event */
-        __raw_writel(0, MSTIM_CTRL);    /* stop the timer */
-        __raw_writel(0, MSTIM_MCTRL);
-        __raw_writel(RESET_COUNT, HSTIM_CTRL);
-        while (__raw_readl(HSTIM_COUNTER)) ;    /* wait for reset to complete. 100% guarantee event */
-        __raw_writel(0, HSTIM_CTRL);
-        __raw_writel(0, HSTIM_MCTRL);
-        __raw_writel(0, HSTIM_CCR);
-        __raw_writel(12, HSTIM_PMATCH); /* scale down to 1 MHZ */
-        __raw_writel(LATCH, HSTIM_MATCH0);
-        __raw_writel(MR0_INT, HSTIM_MCTRL);
-        setup_irq(HSTIMER_INT, &pnx4008_timer_irq);
-        __raw_writel(COUNT_ENAB | DEBUG_EN, HSTIM_CTRL);        /*start timer, stop when JTAG active */
-}
-/* Timer Clock Control in PM register */
-#define TIMCLK_CTRL_REG  IO_ADDRESS((PNX4008_PWRMAN_BASE + 0xBC))
-#define WATCHDOG_CLK_EN                   1
-#define TIMER_CLK_EN                      2     /* HS and MS timers? */
-static u32 timclk_ctrl_reg_save;
-void pnx4008_timer_suspend(void)
-{
-        timclk_ctrl_reg_save = __raw_readl(TIMCLK_CTRL_REG);
-        __raw_writel(0, TIMCLK_CTRL_REG);       /* disable timers */
-}
-void pnx4008_timer_resume(void)
-{
-        __raw_writel(timclk_ctrl_reg_save, TIMCLK_CTRL_REG);    /* enable timers */
-}
-struct sys_timer pnx4008_timer = {
-        .init = pnx4008_setup_timer,
-        .offset = pnx4008_gettimeoffset,
-        .suspend = pnx4008_timer_suspend,
-        .resume = pnx4008_timer_resume,
-};

diff --git a/arch/arm/mach-pnx4008/time.c b/arch/arm/mach-pnx4008/time.c deleted file mode 100644 index 0cfe8af3d3be..000000000000 --- a/arch/arm/mach-pnx4008/time.c +++ /dev/null
@@ -1,134 +0,0 @@
1	/*
2	* arch/arm/mach-pnx4008/time.c
3	*
4	* PNX4008 Timers
5	*
6	* Authors: Vitaly Wool, Dmitry Chigirev, Grigory Tolstolytkin <source@mvista.com>
7	*
8	* 2005 (c) MontaVista Software, Inc. This file is licensed under
9	* the terms of the GNU General Public License version 2. This program
10	* is licensed "as is" without any warranty of any kind, whether express
11	* or implied.
12	*/
13
14	#include <linux/kernel.h>
15	#include <linux/init.h>
16	#include <linux/delay.h>
17	#include <linux/interrupt.h>
18	#include <linux/sched.h>
19	#include <linux/spinlock.h>
20	#include <linux/module.h>
21	#include <linux/kallsyms.h>
22	#include <linux/time.h>
23	#include <linux/timex.h>
24	#include <linux/irq.h>
25	#include <linux/io.h>
26
27	#include <mach/hardware.h>
28	#include <asm/leds.h>
29	#include <asm/mach/time.h>
30	#include <asm/errno.h>
31
32	#include "time.h"
33
34	/! Note: all timers are UPCOUNTING /
35
36	/*!
37	* Returns number of us since last clock interrupt. Note that interrupts
38	* will have been disabled by do_gettimeoffset()
39	*/
40	static unsigned long pnx4008_gettimeoffset(void)
41	{
42	u32 ticks_to_match =
43	__raw_readl(HSTIM_MATCH0) - __raw_readl(HSTIM_COUNTER);
44	u32 elapsed = LATCH - ticks_to_match;
45	return (elapsed * (tick_nsec / 1000)) / LATCH;
46	}
47
48	/*!
49	* IRQ handler for the timer
50	*/
51	static irqreturn_t pnx4008_timer_interrupt(int irq, void *dev_id)
52	{
53	if (__raw_readl(HSTIM_INT) & MATCH0_INT) {
54
55	do {
56	timer_tick();
57
58	/*
59	* this algorithm takes care of possible delay
60	* for this interrupt handling longer than a normal
61	* timer period
62	*/
63	__raw_writel(__raw_readl(HSTIM_MATCH0) + LATCH,
64	HSTIM_MATCH0);
65	__raw_writel(MATCH0_INT, HSTIM_INT); /* clear interrupt */
66
67	/*
68	* The goal is to keep incrementing HSTIM_MATCH0
69	* register until HSTIM_MATCH0 indicates time after
70	* what HSTIM_COUNTER indicates.
71	*/
72	} while ((signed)
73	(__raw_readl(HSTIM_MATCH0) -
74	__raw_readl(HSTIM_COUNTER)) < 0);
75	}
76
77	return IRQ_HANDLED;
78	}
79
80	static struct irqaction pnx4008_timer_irq = {
81	.name = "PNX4008 Tick Timer",
82	.flags = IRQF_DISABLED \| IRQF_TIMER \| IRQF_IRQPOLL,
83	.handler = pnx4008_timer_interrupt
84	};
85
86	/*!
87	* Set up timer and timer interrupt.
88	*/
89	static __init void pnx4008_setup_timer(void)
90	{
91	__raw_writel(RESET_COUNT, MSTIM_CTRL);
92	while (__raw_readl(MSTIM_COUNTER)) ; /* wait for reset to complete. 100% guarantee event */
93	__raw_writel(0, MSTIM_CTRL); /* stop the timer */
94	__raw_writel(0, MSTIM_MCTRL);
95
96	__raw_writel(RESET_COUNT, HSTIM_CTRL);
97	while (__raw_readl(HSTIM_COUNTER)) ; /* wait for reset to complete. 100% guarantee event */
98	__raw_writel(0, HSTIM_CTRL);
99	__raw_writel(0, HSTIM_MCTRL);
100	__raw_writel(0, HSTIM_CCR);
101	__raw_writel(12, HSTIM_PMATCH); /* scale down to 1 MHZ */
102	__raw_writel(LATCH, HSTIM_MATCH0);
103	__raw_writel(MR0_INT, HSTIM_MCTRL);
104
105	setup_irq(HSTIMER_INT, &pnx4008_timer_irq);
106
107	__raw_writel(COUNT_ENAB \| DEBUG_EN, HSTIM_CTRL); /start timer, stop when JTAG active /
108	}
109
110	/* Timer Clock Control in PM register */
111	#define TIMCLK_CTRL_REG IO_ADDRESS((PNX4008_PWRMAN_BASE + 0xBC))
112	#define WATCHDOG_CLK_EN 1
113	#define TIMER_CLK_EN 2 /* HS and MS timers? */
114
115	static u32 timclk_ctrl_reg_save;
116
117	void pnx4008_timer_suspend(void)
118	{
119	timclk_ctrl_reg_save = __raw_readl(TIMCLK_CTRL_REG);
120	__raw_writel(0, TIMCLK_CTRL_REG); /* disable timers */
121	}
122
123	void pnx4008_timer_resume(void)
124	{
125	__raw_writel(timclk_ctrl_reg_save, TIMCLK_CTRL_REG); /* enable timers */
126	}
127
128	struct sys_timer pnx4008_timer = {
129	.init = pnx4008_setup_timer,
130	.offset = pnx4008_gettimeoffset,
131	.suspend = pnx4008_timer_suspend,
132	.resume = pnx4008_timer_resume,
133	};
134