aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/philips
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-07-09 16:38:56 -0400
committerRalf Baechle <ralf@linux-mips.org>2006-07-13 16:26:17 -0400
commit54d0a216f40e060ba4265bb851cc36b3ca55d1a8 (patch)
treea57ecc2da68fea0989c397bd97ebd38e93fee569 /arch/mips/philips
parent2c70df5b9807293705d8123d1f36579831ac09eb (diff)
[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org> ---
Diffstat (limited to 'arch/mips/philips')
-rw-r--r--arch/mips/philips/pnx8550/common/setup.c2
-rw-r--r--arch/mips/philips/pnx8550/common/time.c11
2 files changed, 1 insertions, 12 deletions
diff --git a/arch/mips/philips/pnx8550/common/setup.c b/arch/mips/philips/pnx8550/common/setup.c
index 57fc5938c91..36b0c8bc6c0 100644
--- a/arch/mips/philips/pnx8550/common/setup.c
+++ b/arch/mips/philips/pnx8550/common/setup.c
@@ -50,7 +50,6 @@ extern void pnx8550_machine_power_off(void);
50extern struct resource ioport_resource; 50extern struct resource ioport_resource;
51extern struct resource iomem_resource; 51extern struct resource iomem_resource;
52extern void pnx8550_time_init(void); 52extern void pnx8550_time_init(void);
53extern void pnx8550_timer_setup(struct irqaction *irq);
54extern void rs_kgdb_hook(int tty_no); 53extern void rs_kgdb_hook(int tty_no);
55extern void prom_printf(char *fmt, ...); 54extern void prom_printf(char *fmt, ...);
56extern char *prom_getcmdline(void); 55extern char *prom_getcmdline(void);
@@ -109,7 +108,6 @@ void __init plat_mem_setup(void)
109 pm_power_off = pnx8550_machine_power_off; 108 pm_power_off = pnx8550_machine_power_off;
110 109
111 board_time_init = pnx8550_time_init; 110 board_time_init = pnx8550_time_init;
112 board_timer_setup = pnx8550_timer_setup;
113 111
114 /* Clear the Global 2 Register, PCI Inta Output Enable Registers 112 /* Clear the Global 2 Register, PCI Inta Output Enable Registers
115 Bit 1:Enable DAC Powerdown 113 Bit 1:Enable DAC Powerdown
diff --git a/arch/mips/philips/pnx8550/common/time.c b/arch/mips/philips/pnx8550/common/time.c
index 70664ea96b9..0af655b1f33 100644
--- a/arch/mips/philips/pnx8550/common/time.c
+++ b/arch/mips/philips/pnx8550/common/time.c
@@ -70,16 +70,7 @@ void pnx8550_time_init(void)
70 mips_hpt_frequency = 27UL * ((1000000UL * n)/(m * pow2p)); 70 mips_hpt_frequency = 27UL * ((1000000UL * n)/(m * pow2p));
71} 71}
72 72
73/* 73void __init plat_timer_setup(struct irqaction *irq)
74 * pnx8550_timer_setup() - it does the following things:
75 *
76 * 5) board_timer_setup() -
77 * a) (optional) over-write any choices made above by time_init().
78 * b) machine specific code should setup the timer irqaction.
79 * c) enable the timer interrupt
80 */
81
82void __init pnx8550_timer_setup(struct irqaction *irq)
83{ 74{
84 int configPR; 75 int configPR;
85 76