Skip to content

Commit

Permalink
MIPS: PNX8550: Sort out machine halt, restart and powerdown functions.
Browse files Browse the repository at this point in the history
No rubbish printks - those belong to userspace.  The halt function now
actually halts the system and the poweroff function was deleted because
it didn't actually power down the system.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Ralf Baechle committed Oct 4, 2010
1 parent 863cb9b commit c1b47e9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 17 deletions.
20 changes: 5 additions & 15 deletions arch/mips/pnx8550/common/reset.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,19 @@
*/
#include <linux/kernel.h>

#include <asm/processor.h>
#include <asm/reboot.h>
#include <glb.h>

void pnx8550_machine_restart(char *command)
{
char head[] = "************* Machine restart *************";
char foot[] = "*******************************************";

printk("\n\n");
printk("%s\n", head);
if (command != NULL)
printk("* %s\n", command);
printk("%s\n", foot);

PNX8550_RST_CTL = PNX8550_RST_DO_SW_RST;
}

void pnx8550_machine_halt(void)
{
printk("*** Machine halt. (Not implemented) ***\n");
}

void pnx8550_machine_power_off(void)
{
printk("*** Machine power off. (Not implemented) ***\n");
while (1) {
if (cpu_wait)
cpu_wait();
}
}
3 changes: 1 addition & 2 deletions arch/mips/pnx8550/common/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
extern void __init board_setup(void);
extern void pnx8550_machine_restart(char *);
extern void pnx8550_machine_halt(void);
extern void pnx8550_machine_power_off(void);
extern struct resource ioport_resource;
extern struct resource iomem_resource;
extern char *prom_getcmdline(void);
Expand Down Expand Up @@ -100,7 +99,7 @@ void __init plat_mem_setup(void)

_machine_restart = pnx8550_machine_restart;
_machine_halt = pnx8550_machine_halt;
pm_power_off = pnx8550_machine_power_off;
pm_power_off = pnx8550_machine_halt;

/* Clear the Global 2 Register, PCI Inta Output Enable Registers
Bit 1:Enable DAC Powerdown
Expand Down

0 comments on commit c1b47e9

Please sign in to comment.