Skip to content

Commit

Permalink
[POWERPC] Celleb: Move pause, kexec_cpu_down to beat.c
Browse files Browse the repository at this point in the history
This is an update for "Beat on Celleb"
  - Move beat_pause(), beat_kexec_cpu_down() from setup.c to beat.c

Signed-off-by: <Kou.Ishizaki@toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Ishizaki Kou authored and Paul Mackerras committed Oct 3, 2007
1 parent 74c9b99 commit 80755b4
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
12 changes: 12 additions & 0 deletions arch/powerpc/platforms/celleb/beat.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,18 @@ int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2)
return beat_put_characters_to_console(vterm, len, (u8*)db);
}

void beat_power_save(void)
{
beat_pause(0);
}

#ifdef CONFIG_KEXEC
void beat_kexec_cpu_down(int crash, int secondary)
{
beatic_deinit_IRQ();
}
#endif

EXPORT_SYMBOL(beat_get_term_char);
EXPORT_SYMBOL(beat_put_term_char);
EXPORT_SYMBOL(beat_halt_code);
2 changes: 2 additions & 0 deletions arch/powerpc/platforms/celleb/beat.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,7 @@ ssize_t beat_nvram_get_size(void);
ssize_t beat_nvram_read(char *, size_t, loff_t *);
ssize_t beat_nvram_write(char *, size_t, loff_t *);
int beat_set_xdabr(unsigned long);
void beat_power_save(void);
void beat_kexec_cpu_down(int, int);

#endif /* _CELLEB_BEAT_H */
14 changes: 1 addition & 13 deletions arch/powerpc/platforms/celleb/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,6 @@ static void __init celleb_setup_arch(void)
#endif
}

static void beat_power_save(void)
{
beat_pause(0);
}

static int __init celleb_probe(void)
{
unsigned long root = of_get_flat_dt_root();
Expand All @@ -128,13 +123,6 @@ static int __init celleb_probe(void)
return 1;
}

#ifdef CONFIG_KEXEC
static void celleb_kexec_cpu_down(int crash, int secondary)
{
beatic_deinit_IRQ();
}
#endif

static struct of_device_id celleb_bus_ids[] __initdata = {
{ .type = "scc", },
{ .type = "ioif", }, /* old style */
Expand Down Expand Up @@ -175,7 +163,7 @@ define_machine(celleb) {
.pci_probe_mode = celleb_pci_probe_mode,
.pci_setup_phb = celleb_setup_phb,
#ifdef CONFIG_KEXEC
.kexec_cpu_down = celleb_kexec_cpu_down,
.kexec_cpu_down = beat_kexec_cpu_down,
.machine_kexec = default_machine_kexec,
.machine_kexec_prepare = default_machine_kexec_prepare,
.machine_crash_shutdown = default_machine_crash_shutdown,
Expand Down

0 comments on commit 80755b4

Please sign in to comment.