diff options
-rw-r--r-- | arch/powerpc/platforms/celleb/beat.c | 12 | ||||
-rw-r--r-- | arch/powerpc/platforms/celleb/beat.h | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/celleb/setup.c | 14 |
3 files changed, 15 insertions, 13 deletions
diff --git a/arch/powerpc/platforms/celleb/beat.c b/arch/powerpc/platforms/celleb/beat.c index 99341ce8a697..ced6f68c7b0b 100644 --- a/arch/powerpc/platforms/celleb/beat.c +++ b/arch/powerpc/platforms/celleb/beat.c | |||
@@ -158,6 +158,18 @@ int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2) | |||
158 | return beat_put_characters_to_console(vterm, len, (u8*)db); | 158 | return beat_put_characters_to_console(vterm, len, (u8*)db); |
159 | } | 159 | } |
160 | 160 | ||
161 | void beat_power_save(void) | ||
162 | { | ||
163 | beat_pause(0); | ||
164 | } | ||
165 | |||
166 | #ifdef CONFIG_KEXEC | ||
167 | void beat_kexec_cpu_down(int crash, int secondary) | ||
168 | { | ||
169 | beatic_deinit_IRQ(); | ||
170 | } | ||
171 | #endif | ||
172 | |||
161 | EXPORT_SYMBOL(beat_get_term_char); | 173 | EXPORT_SYMBOL(beat_get_term_char); |
162 | EXPORT_SYMBOL(beat_put_term_char); | 174 | EXPORT_SYMBOL(beat_put_term_char); |
163 | EXPORT_SYMBOL(beat_halt_code); | 175 | EXPORT_SYMBOL(beat_halt_code); |
diff --git a/arch/powerpc/platforms/celleb/beat.h b/arch/powerpc/platforms/celleb/beat.h index 2b16bf3bee89..b2e292df13ca 100644 --- a/arch/powerpc/platforms/celleb/beat.h +++ b/arch/powerpc/platforms/celleb/beat.h | |||
@@ -36,5 +36,7 @@ ssize_t beat_nvram_get_size(void); | |||
36 | ssize_t beat_nvram_read(char *, size_t, loff_t *); | 36 | ssize_t beat_nvram_read(char *, size_t, loff_t *); |
37 | ssize_t beat_nvram_write(char *, size_t, loff_t *); | 37 | ssize_t beat_nvram_write(char *, size_t, loff_t *); |
38 | int beat_set_xdabr(unsigned long); | 38 | int beat_set_xdabr(unsigned long); |
39 | void beat_power_save(void); | ||
40 | void beat_kexec_cpu_down(int, int); | ||
39 | 41 | ||
40 | #endif /* _CELLEB_BEAT_H */ | 42 | #endif /* _CELLEB_BEAT_H */ |
diff --git a/arch/powerpc/platforms/celleb/setup.c b/arch/powerpc/platforms/celleb/setup.c index 1fca3f23533b..a2180aa509d9 100644 --- a/arch/powerpc/platforms/celleb/setup.c +++ b/arch/powerpc/platforms/celleb/setup.c | |||
@@ -111,11 +111,6 @@ static void __init celleb_setup_arch(void) | |||
111 | #endif | 111 | #endif |
112 | } | 112 | } |
113 | 113 | ||
114 | static void beat_power_save(void) | ||
115 | { | ||
116 | beat_pause(0); | ||
117 | } | ||
118 | |||
119 | static int __init celleb_probe(void) | 114 | static int __init celleb_probe(void) |
120 | { | 115 | { |
121 | unsigned long root = of_get_flat_dt_root(); | 116 | unsigned long root = of_get_flat_dt_root(); |
@@ -128,13 +123,6 @@ static int __init celleb_probe(void) | |||
128 | return 1; | 123 | return 1; |
129 | } | 124 | } |
130 | 125 | ||
131 | #ifdef CONFIG_KEXEC | ||
132 | static void celleb_kexec_cpu_down(int crash, int secondary) | ||
133 | { | ||
134 | beatic_deinit_IRQ(); | ||
135 | } | ||
136 | #endif | ||
137 | |||
138 | static struct of_device_id celleb_bus_ids[] __initdata = { | 126 | static struct of_device_id celleb_bus_ids[] __initdata = { |
139 | { .type = "scc", }, | 127 | { .type = "scc", }, |
140 | { .type = "ioif", }, /* old style */ | 128 | { .type = "ioif", }, /* old style */ |
@@ -175,7 +163,7 @@ define_machine(celleb) { | |||
175 | .pci_probe_mode = celleb_pci_probe_mode, | 163 | .pci_probe_mode = celleb_pci_probe_mode, |
176 | .pci_setup_phb = celleb_setup_phb, | 164 | .pci_setup_phb = celleb_setup_phb, |
177 | #ifdef CONFIG_KEXEC | 165 | #ifdef CONFIG_KEXEC |
178 | .kexec_cpu_down = celleb_kexec_cpu_down, | 166 | .kexec_cpu_down = beat_kexec_cpu_down, |
179 | .machine_kexec = default_machine_kexec, | 167 | .machine_kexec = default_machine_kexec, |
180 | .machine_kexec_prepare = default_machine_kexec_prepare, | 168 | .machine_kexec_prepare = default_machine_kexec_prepare, |
181 | .machine_crash_shutdown = default_machine_crash_shutdown, | 169 | .machine_crash_shutdown = default_machine_crash_shutdown, |