Author: marius
Date: Wed Jan 13 21:21:29 2010
New Revision: 202262
URL: http://svn.freebsd.org/changeset/base/202262
Log:
MFC: r200926
Recognize the NS16552 found in PCIe-based sun4u machines.
Modified:
stable/8/sys/dev/uart/uart_bus_ebus.c
stable/8/sys/dev/uart/uart_cpu_sparc64.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/uart/uart_bus_ebus.c
==============================================================================
--- stable/8/sys/dev/uart/uart_bus_ebus.c Wed Jan 13 21:19:46 2010
(r202261)
+++ stable/8/sys/dev/uart/uart_bus_ebus.c Wed Jan 13 21:21:29 2010
(r202262)
@@ -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.
Modified: stable/8/sys/dev/uart/uart_cpu_sparc64.c
==============================================================================
--- stable/8/sys/dev/uart/uart_cpu_sparc64.c Wed Jan 13 21:19:46 2010
(r202261)
+++ stable/8/sys/dev/uart/uart_cpu_sparc64.c Wed Jan 13 21:21:29 2010
(r202262)
@@ -254,7 +254,8 @@ uart_cpu_getdev(int devtype, struct uart
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;
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
