Commit:     b63db45ca44a805ef21eb10a3750e88419156423
Parent:     1189be6508d45183013ddb82b18f4934193de274
Author:     Valentine Barshak <[EMAIL PROTECTED]>
AuthorDate: Fri Oct 12 05:09:25 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Fri Oct 12 14:05:18 2007 +1000

    [POWERPC] Add legacy serial support for OPB with flattened device tree
    Currently find_legacy_serial_ports() can find no serial ports on the
    OPB with flattened device tree.  Thus no legacy boot console can be
    initialized.  Just the early udbg console works, which is initialized
    with udbg_init_44x_as1 on the UART's physical address specified in
    kernel config.  This happens because we look for ns16750 serial
    devices only and expect opb node to have a device type property.  This
    patch makes it look for ns16550-compatible devices and use
    of_device_is_compatible() for opb in case device type is not
    Signed-off-by: Valentine Barshak <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 arch/powerpc/kernel/legacy_serial.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/legacy_serial.c 
index 90fa11c..4ed5887 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -340,9 +340,10 @@ void __init find_legacy_serial_ports(void)
        /* First fill our array with opb bus ports */
-       for (np = NULL; (np = of_find_compatible_node(np, "serial", "ns16750")) 
!= NULL;) {
+       for (np = NULL; (np = of_find_compatible_node(np, "serial", "ns16550")) 
!= NULL;) {
                struct device_node *opb = of_get_parent(np);
-               if (opb && !strcmp(opb->type, "opb")) {
+               if (opb && (!strcmp(opb->type, "opb") ||
+                           of_device_is_compatible(opb, "ibm,opb"))) {
                        index = add_legacy_soc_port(np, np);
                        if (index >= 0 && np == stdout)
                                legacy_serial_console = index;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to