sunsu: Fix detection of SU ports which are RSC console or control.
authorDavid S. Miller <davem@davemloft.net>
Tue, 24 Nov 2009 21:58:52 +0000 (13:58 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Nov 2009 21:58:52 +0000 (13:58 -0800)
These device nodes are named "rsc-console" and "rsc-control" rather
than 'serial', but the device_type property is 'serial' so we'll
tip off of that for detection.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/serial/sunsu.c

index 68d262b15749584354defe8c5bf7a886383dad76..f6511a44d15b4d914c1d8a78b2a736e33f0b3acf 100644 (file)
@@ -1517,6 +1517,10 @@ static const struct of_device_id su_match[] = {
                .name = "serial",
                .compatible = "su",
        },
+       {
+               .type = "serial",
+               .compatible = "su",
+       },
        {},
 };
 MODULE_DEVICE_TABLE(of, su_match);
@@ -1548,6 +1552,12 @@ static int __init sunsu_init(void)
                                num_uart++;
                }
        }
+       for_each_node_by_type(dp, "serial") {
+               if (of_device_is_compatible(dp, "su")) {
+                       if (su_get_type(dp) == SU_PORT_PORT)
+                               num_uart++;
+               }
+       }
 
        if (num_uart) {
                err = sunserial_register_minors(&sunsu_reg, num_uart);