Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80755b41 authored by Ishizaki Kou's avatar Ishizaki Kou Committed by Paul Mackerras
Browse files

[POWERPC] Celleb: Move pause, kexec_cpu_down to beat.c 



This is an update for "Beat on Celleb"
  - Move beat_pause(), beat_kexec_cpu_down() from setup.c to beat.c

Signed-off-by: default avatar <Kou.Ishizaki@toshiba.co.jp>
Acked-by: default avatarArnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 74c9b99d

arch/powerpc/platforms/celleb/beat.c

+12 −0
Original line number Diff line number Diff line
@@ -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);

arch/powerpc/platforms/celleb/beat.h

+2 −0
Original line number Diff line number Diff line
@@ -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 */

arch/powerpc/platforms/celleb/setup.c

+1 −13
Original line number Diff line number Diff line
@@ -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();
@@ -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 */
@@ -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,