diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-30 10:24:24 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-30 10:24:24 +1000 |
| commit | e089ad46dbede9eed650f12d039d1addc05adf43 (patch) | |
| tree | 2056051ceccf0e04503dc7c6aceb5b242a69d4e4 /arch | |
| parent | 8d8a0241eb019ce9648a77b55f9f76a834207cbb (diff) | |
| download | op-kernel-dev-e089ad46dbede9eed650f12d039d1addc05adf43.zip op-kernel-dev-e089ad46dbede9eed650f12d039d1addc05adf43.tar.gz | |
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.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/52xx/efika.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c index 0eceb1f..a6bba97 100644 --- a/arch/powerpc/platforms/52xx/efika.c +++ b/arch/powerpc/platforms/52xx/efika.c @@ -21,7 +21,6 @@ #include <linux/initrd.h> #include <linux/timer.h> #include <linux/pci.h> -#include <linux/console.h> #include <asm/io.h> #include <asm/irq.h> @@ -221,37 +220,12 @@ static int __init efika_probe(void) return 1; } -static void __init efika_init_early(void) -{ -#ifdef CONFIG_SERIAL_MPC52xx - struct device_node *stdout_node; - const char *device_type; - - if (strstr(cmd_line, "console=")) - return; - /* find the boot console from /chosen/stdout */ - if (!of_chosen) - return; - device_type = of_get_property(of_chosen, "linux,stdout-path", NULL); - if (!device_type) - return; - stdout_node = of_find_node_by_path(device_type); - if (stdout_node) { - device_type = of_get_property(stdout_node, "device_type", NULL); - if (device_type && strcmp(device_type, "serial") == 0) - add_preferred_console("ttyPSC", 0, NULL); - of_node_put(stdout_node); - } -#endif -} - define_machine(efika) { .name = EFIKA_PLATFORM_NAME, .probe = efika_probe, .setup_arch = efika_setup_arch, .init = mpc52xx_declare_of_platform_devices, - .init_early = efika_init_early, .show_cpuinfo = efika_show_cpuinfo, .init_IRQ = mpc52xx_init_irq, .get_irq = mpc52xx_get_irq, |
