diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 18:46:08 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 18:46:08 -0400 |
commit | 4b550488f894c899aa54dc935c8fee47bca2b7df (patch) | |
tree | f7ee1d0ff80542124b5fa864a30022277d703c49 /arch/mips/tx4938 | |
parent | f5ff0a280201c9cbfb6e9eb4bafdb465c2269ed3 (diff) |
[MIPS] Deforest the function pointer jungle in the time code.
Hard to follow who is pointing what to where and why so it's simply getting
in the way of the time code renovation.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/tx4938')
-rw-r--r-- | arch/mips/tx4938/common/setup.c | 9 | ||||
-rw-r--r-- | arch/mips/tx4938/toshiba_rbtx4938/setup.c | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/arch/mips/tx4938/common/setup.c b/arch/mips/tx4938/common/setup.c index 142abf453e40..ab4082267553 100644 --- a/arch/mips/tx4938/common/setup.c +++ b/arch/mips/tx4938/common/setup.c | |||
@@ -34,25 +34,16 @@ | |||
34 | #include <asm/tx4938/rbtx4938.h> | 34 | #include <asm/tx4938/rbtx4938.h> |
35 | 35 | ||
36 | extern void toshiba_rbtx4938_setup(void); | 36 | extern void toshiba_rbtx4938_setup(void); |
37 | extern void rbtx4938_time_init(void); | ||
38 | 37 | ||
39 | void __init tx4938_setup(void); | 38 | void __init tx4938_setup(void); |
40 | void __init tx4938_time_init(void); | ||
41 | void dump_cp0(char *key); | 39 | void dump_cp0(char *key); |
42 | 40 | ||
43 | void __init | 41 | void __init |
44 | plat_mem_setup(void) | 42 | plat_mem_setup(void) |
45 | { | 43 | { |
46 | board_time_init = tx4938_time_init; | ||
47 | toshiba_rbtx4938_setup(); | 44 | toshiba_rbtx4938_setup(); |
48 | } | 45 | } |
49 | 46 | ||
50 | void __init | ||
51 | tx4938_time_init(void) | ||
52 | { | ||
53 | rbtx4938_time_init(); | ||
54 | } | ||
55 | |||
56 | void __init plat_timer_setup(struct irqaction *irq) | 47 | void __init plat_timer_setup(struct irqaction *irq) |
57 | { | 48 | { |
58 | setup_irq(TX4938_IRQ_CPU_TIMER, irq); | 49 | setup_irq(TX4938_IRQ_CPU_TIMER, irq); |
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c index f236b1ff8923..304b406fcb9d 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c +++ b/arch/mips/tx4938/toshiba_rbtx4938/setup.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <asm/tx4938/spi.h> | 39 | #include <asm/tx4938/spi.h> |
40 | #include <asm/gpio.h> | 40 | #include <asm/gpio.h> |
41 | 41 | ||
42 | extern void rbtx4938_time_init(void) __init; | ||
43 | extern char * __init prom_getcmdline(void); | 42 | extern char * __init prom_getcmdline(void); |
44 | static inline void tx4938_report_pcic_status1(struct tx4938_pcic_reg *pcicptr); | 43 | static inline void tx4938_report_pcic_status1(struct tx4938_pcic_reg *pcicptr); |
45 | 44 | ||
@@ -856,7 +855,7 @@ void tx4938_report_pcic_status(void) | |||
856 | /* We use onchip r4k counter or TMR timer as our system wide timer | 855 | /* We use onchip r4k counter or TMR timer as our system wide timer |
857 | * interrupt running at 100HZ. */ | 856 | * interrupt running at 100HZ. */ |
858 | 857 | ||
859 | void __init rbtx4938_time_init(void) | 858 | void __init plat_time_init(void) |
860 | { | 859 | { |
861 | mips_hpt_frequency = txx9_cpu_clock / 2; | 860 | mips_hpt_frequency = txx9_cpu_clock / 2; |
862 | } | 861 | } |