summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMarius Strobl <marius@FreeBSD.org>2010-01-13 21:21:32 +0000
committerMarius Strobl <marius@FreeBSD.org>2010-01-13 21:21:32 +0000
commitb8b4d8455dcdcb063943b267ac385ebcca19040b (patch)
tree78d03ce15958171a9523315abfcfe2ea8f91910b /sys/dev
parent3d042d3141500912ddc20b173ae6c85be81451c6 (diff)
MFC: r200926
Recognize the NS16552 found in PCIe-based sun4u machines.
Notes
svn path=/stable/7/; revision=202263
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/uart/uart_bus_ebus.c2
-rw-r--r--sys/dev/uart/uart_cpu_sparc64.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/uart/uart_bus_ebus.c b/sys/dev/uart/uart_bus_ebus.c
index e4ea2d149376..c79c91e908ef 100644
--- a/sys/dev/uart/uart_bus_ebus.c
+++ b/sys/dev/uart/uart_bus_ebus.c
@@ -77,7 +77,7 @@ uart_ebus_probe(device_t dev)
if (!strcmp(nm, "lom-console") || !strcmp(nm, "su") ||
!strcmp(nm, "su_pnp") || !strcmp(cmpt, "rsc-console") ||
!strcmp(cmpt, "rsc-control") || !strcmp(cmpt, "su") ||
- !strcmp(cmpt, "su16550")) {
+ !strcmp(cmpt, "su16550") || !strcmp(cmpt, "su16552")) {
/*
* On AXi and AXmp boards the NS16550 (used to connect
* keyboard/mouse) share their IRQ lines with the i8042.
diff --git a/sys/dev/uart/uart_cpu_sparc64.c b/sys/dev/uart/uart_cpu_sparc64.c
index 9d92a3908732..0f40cb70bd73 100644
--- a/sys/dev/uart/uart_cpu_sparc64.c
+++ b/sys/dev/uart/uart_cpu_sparc64.c
@@ -254,7 +254,8 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
addr += range - range * (di->bas.chan - 1);
} else if (!strcmp(buf, "lom-console") || !strcmp(buf, "su") ||
!strcmp(buf, "su_pnp") || !strcmp(compat, "rsc-console") ||
- !strcmp(compat, "su") || !strcmp(compat, "su16550")) {
+ !strcmp(compat, "su") || !strcmp(compat, "su16550") ||
+ !strcmp(compat, "su16552")) {
class = &uart_ns8250_class;
di->bas.chan = 0;
}