diff --git a/[refs] b/[refs] index cc44c2ae12d3..27f24c32332f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e68e188411ea98e40309700cf0c89ad4469ac1d +refs/heads/master: 8301d386afc55c877bafe2c6c7dc75a96ddd2838 diff --git a/trunk/drivers/serial/sunsu.c b/trunk/drivers/serial/sunsu.c index 68d262b15749..f6511a44d15b 100644 --- a/trunk/drivers/serial/sunsu.c +++ b/trunk/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);