Skip to content

Commit

Permalink
[MIPS] Fix EV64120 and Ocelot builds by providing a plat_timer_setup().
Browse files Browse the repository at this point in the history
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Ralf Baechle committed Nov 6, 2006
1 parent 4e5852f commit 73f4388
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion arch/mips/gt64120/common/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static irqreturn_t gt64120_irq(int irq, void *dev_id)
* as *irq (=irq0 in ../kernel/time.c). We will do our own timer interrupt
* handling.
*/
void gt64120_time_init(void)
void __init plat_timer_setup(struct irqaction *irq)
{
static struct irqaction timer;

Expand Down
2 changes: 0 additions & 2 deletions arch/mips/gt64120/ev64120/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,13 @@ unsigned long __init prom_free_prom_memory(void)
* Initializes basic routines and structures pointers, memory size (as
* given by the bios and saves the command line.
*/
extern void gt64120_time_init(void);

void __init plat_mem_setup(void)
{
_machine_restart = galileo_machine_restart;
_machine_halt = galileo_machine_halt;
pm_power_off = galileo_machine_power_off;

board_time_init = gt64120_time_init;
set_io_port_base(KSEG1);
}

Expand Down
3 changes: 0 additions & 3 deletions arch/mips/gt64120/momenco_ocelot/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ extern void momenco_ocelot_restart(char *command);
extern void momenco_ocelot_halt(void);
extern void momenco_ocelot_power_off(void);

extern void gt64120_time_init(void);
extern void momenco_ocelot_irq_setup(void);

static char reset_reason;
Expand Down Expand Up @@ -156,8 +155,6 @@ void __init plat_mem_setup(void)
void (*l3func)(unsigned long)=KSEG1ADDR(&setup_l3cache);
unsigned int tmpword;

board_time_init = gt64120_time_init;

_machine_restart = momenco_ocelot_restart;
_machine_halt = momenco_ocelot_halt;
pm_power_off = momenco_ocelot_power_off;
Expand Down

0 comments on commit 73f4388

Please sign in to comment.