diff options
author | David S. Miller <davem@davemloft.net> | 2009-11-24 13:58:52 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-18 13:44:00 -0800 |
commit | 93e2a9c73973b7f01cb56b33db8c9ac7bf35cfa7 (patch) | |
tree | 03acc25953e39a8de2903304fc548b69b15eded2 /drivers | |
parent | 313775a1ae8d7d951810e173ce9295f07e5f2f78 (diff) |
sunsu: Fix detection of SU ports which are RSC console or control.
[ Upstream commit 8301d386afc55c877bafe2c6c7dc75a96ddd2838 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/serial/sunsu.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 47c6837850b..e1b477058d7 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c @@ -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); |