diff options
Diffstat (limited to 'arch/mips/philips')
-rw-r--r-- | arch/mips/philips/pnx8550/common/setup.c | 3 | ||||
-rw-r--r-- | arch/mips/philips/pnx8550/common/time.c | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/mips/philips/pnx8550/common/setup.c b/arch/mips/philips/pnx8550/common/setup.c index 5bd737477685..2ce298f4d19a 100644 --- a/arch/mips/philips/pnx8550/common/setup.c +++ b/arch/mips/philips/pnx8550/common/setup.c | |||
@@ -47,7 +47,6 @@ extern void pnx8550_machine_halt(void); | |||
47 | extern void pnx8550_machine_power_off(void); | 47 | extern void pnx8550_machine_power_off(void); |
48 | extern struct resource ioport_resource; | 48 | extern struct resource ioport_resource; |
49 | extern struct resource iomem_resource; | 49 | extern struct resource iomem_resource; |
50 | extern void pnx8550_time_init(void); | ||
51 | extern void rs_kgdb_hook(int tty_no); | 50 | extern void rs_kgdb_hook(int tty_no); |
52 | extern char *prom_getcmdline(void); | 51 | extern char *prom_getcmdline(void); |
53 | 52 | ||
@@ -104,8 +103,6 @@ void __init plat_mem_setup(void) | |||
104 | _machine_halt = pnx8550_machine_halt; | 103 | _machine_halt = pnx8550_machine_halt; |
105 | pm_power_off = pnx8550_machine_power_off; | 104 | pm_power_off = pnx8550_machine_power_off; |
106 | 105 | ||
107 | board_time_init = pnx8550_time_init; | ||
108 | |||
109 | /* Clear the Global 2 Register, PCI Inta Output Enable Registers | 106 | /* Clear the Global 2 Register, PCI Inta Output Enable Registers |
110 | Bit 1:Enable DAC Powerdown | 107 | Bit 1:Enable DAC Powerdown |
111 | -> 0:DACs are enabled and are working normally | 108 | -> 0:DACs are enabled and are working normally |
diff --git a/arch/mips/philips/pnx8550/common/time.c b/arch/mips/philips/pnx8550/common/time.c index 68def3880a1c..e818fd0f1584 100644 --- a/arch/mips/philips/pnx8550/common/time.c +++ b/arch/mips/philips/pnx8550/common/time.c | |||
@@ -1,6 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright 2001, 2002, 2003 MontaVista Software Inc. | 2 | * Copyright 2001, 2002, 2003 MontaVista Software Inc. |
3 | * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net | 3 | * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net |
4 | * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org) | ||
4 | * | 5 | * |
5 | * Common time service routines for MIPS machines. See | 6 | * Common time service routines for MIPS machines. See |
6 | * Documents/MIPS/README.txt. | 7 | * Documents/MIPS/README.txt. |
@@ -46,16 +47,16 @@ static void timer_ack(void) | |||
46 | } | 47 | } |
47 | 48 | ||
48 | /* | 49 | /* |
49 | * pnx8550_time_init() - it does the following things: | 50 | * plat_time_init() - it does the following things: |
50 | * | 51 | * |
51 | * 1) board_time_init() - | 52 | * 1) plat_time_init() - |
52 | * a) (optional) set up RTC routines, | 53 | * a) (optional) set up RTC routines, |
53 | * b) (optional) calibrate and set the mips_hpt_frequency | 54 | * b) (optional) calibrate and set the mips_hpt_frequency |
54 | * (only needed if you intended to use cpu counter as timer interrupt | 55 | * (only needed if you intended to use cpu counter as timer interrupt |
55 | * source) | 56 | * source) |
56 | */ | 57 | */ |
57 | 58 | ||
58 | void pnx8550_time_init(void) | 59 | __init void plat_time_init(void) |
59 | { | 60 | { |
60 | unsigned int n; | 61 | unsigned int n; |
61 | unsigned int m; | 62 | unsigned int m; |