Skip to content

Commit

Permalink
sh: Make hs7751rvoip/rts7751r2d use pm_power_off.
Browse files Browse the repository at this point in the history
These were previously sprinkled in machine_power_off(),
though missed being updated when the rest of the boards
switched over.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Sep 27, 2006
1 parent 50e98e7 commit a56d276
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
13 changes: 9 additions & 4 deletions arch/sh/boards/renesas/hs7751rvoip/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@

#include <linux/init.h>
#include <linux/irq.h>

#include <linux/mm.h>
#include <linux/vmalloc.h>
#include <linux/hdreg.h>
#include <linux/ide.h>
#include <linux/pm.h>
#include <asm/io.h>
#include <asm/hs7751rvoip/hs7751rvoip.h>

#include <linux/mm.h>
#include <linux/vmalloc.h>

/* defined in mm/ioremap.c */
extern void * p3_ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags);

Expand All @@ -31,13 +30,19 @@ const char *get_system_type(void)
return "HS7751RVoIP";
}

static void hs7751rvoip_power_off(void)
{
ctrl_outw(ctrl_inw(PA_OUTPORTR) & 0xffdf, PA_OUTPORTR);
}

/*
* Initialize the board
*/
void __init platform_setup(void)
{
printk(KERN_INFO "Renesas Technology Sales HS7751RVoIP-2 support.\n");
ctrl_outb(0xf0, PA_OUTPORTR);
pm_power_off = hs7751rvoip_power_off;
debug_counter = 0;
}

Expand Down
7 changes: 7 additions & 0 deletions arch/sh/boards/renesas/rts7751r2d/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/

#include <linux/init.h>
#include <linux/pm.h>
#include <asm/io.h>
#include <asm/rts7751r2d/rts7751r2d.h>

Expand All @@ -20,12 +21,18 @@ const char *get_system_type(void)
return "RTS7751R2D";
}

static void rts7751r2d_power_off(void)
{
ctrl_outw(0x0001, PA_POWOFF);
}

/*
* Initialize the board
*/
void __init platform_setup(void)
{
printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n");
ctrl_outw(0x0000, PA_OUTPORT);
pm_power_off = rts7751r2d_power_off;
debug_counter = 0;
}

0 comments on commit a56d276

Please sign in to comment.