aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-04-29 20:24:24 -0400
committerPaul Mackerras <paulus@samba.org>2007-04-29 20:24:24 -0400
commite089ad46dbede9eed650f12d039d1addc05adf43 (patch)
tree2056051ceccf0e04503dc7c6aceb5b242a69d4e4
parent8d8a0241eb019ce9648a77b55f9f76a834207cbb (diff)
Revert "[POWERPC] Autodetect serial console on efika"
This reverts commit 9414715a7bbb45450015e9bc2676d85d919d08d4, at Olaf Hering's request: > Paul, please discard this patch. The optional graphics card may have > also device_type 'serial' if it is in VGA mode. > I will send an updated patch later.
-rw-r--r--arch/powerpc/platforms/52xx/efika.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
index 0eceb1fc2670..a6bba97314eb 100644
--- a/arch/powerpc/platforms/52xx/efika.c
+++ b/arch/powerpc/platforms/52xx/efika.c
@@ -21,7 +21,6 @@
21#include <linux/initrd.h> 21#include <linux/initrd.h>
22#include <linux/timer.h> 22#include <linux/timer.h>
23#include <linux/pci.h> 23#include <linux/pci.h>
24#include <linux/console.h>
25 24
26#include <asm/io.h> 25#include <asm/io.h>
27#include <asm/irq.h> 26#include <asm/irq.h>
@@ -221,37 +220,12 @@ static int __init efika_probe(void)
221 return 1; 220 return 1;
222} 221}
223 222
224static void __init efika_init_early(void)
225{
226#ifdef CONFIG_SERIAL_MPC52xx
227 struct device_node *stdout_node;
228 const char *device_type;
229
230 if (strstr(cmd_line, "console="))
231 return;
232 /* find the boot console from /chosen/stdout */
233 if (!of_chosen)
234 return;
235 device_type = of_get_property(of_chosen, "linux,stdout-path", NULL);
236 if (!device_type)
237 return;
238 stdout_node = of_find_node_by_path(device_type);
239 if (stdout_node) {
240 device_type = of_get_property(stdout_node, "device_type", NULL);
241 if (device_type && strcmp(device_type, "serial") == 0)
242 add_preferred_console("ttyPSC", 0, NULL);
243 of_node_put(stdout_node);
244 }
245#endif
246}
247
248define_machine(efika) 223define_machine(efika)
249{ 224{
250 .name = EFIKA_PLATFORM_NAME, 225 .name = EFIKA_PLATFORM_NAME,
251 .probe = efika_probe, 226 .probe = efika_probe,
252 .setup_arch = efika_setup_arch, 227 .setup_arch = efika_setup_arch,
253 .init = mpc52xx_declare_of_platform_devices, 228 .init = mpc52xx_declare_of_platform_devices,
254 .init_early = efika_init_early,
255 .show_cpuinfo = efika_show_cpuinfo, 229 .show_cpuinfo = efika_show_cpuinfo,
256 .init_IRQ = mpc52xx_init_irq, 230 .init_IRQ = mpc52xx_init_irq,
257 .get_irq = mpc52xx_get_irq, 231 .get_irq = mpc52xx_get_irq,