svn commit: r224351 - in stable/7/sys/dev: scc uart
Marius Strobl
marius at FreeBSD.org
Mon Jul 25 17:37:54 UTC 2011
Author: marius
Date: Mon Jul 25 17:37:54 2011
New Revision: 224351
URL: http://svn.freebsd.org/changeset/base/224351
Log:
MFC: r221960
Recognize the SAB 82532 found in Fujitsu PRIMEPOWER650 and 900.
Modified:
stable/7/sys/dev/scc/scc_bfe_ebus.c
stable/7/sys/dev/uart/uart_cpu_sparc64.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/scc/scc_bfe_ebus.c
==============================================================================
--- stable/7/sys/dev/scc/scc_bfe_ebus.c Mon Jul 25 17:37:53 2011 (r224350)
+++ stable/7/sys/dev/scc/scc_bfe_ebus.c Mon Jul 25 17:37:54 2011 (r224351)
@@ -56,7 +56,8 @@ scc_ebus_probe(device_t dev)
cmpt = ofw_bus_get_compat(dev);
if (cmpt == NULL)
cmpt = "";
- if (!strcmp(nm, "se") || !strcmp(cmpt, "sab82532")) {
+ if (!strcmp(nm, "se") || !strcmp(nm, "FJSV,se") ||
+ !strcmp(cmpt, "sab82532")) {
device_set_desc(dev, "Siemens SAB 82532 dual channel SCC");
sc->sc_class = &scc_sab82532_class;
return (scc_bfe_probe(dev, EBUS_REGSHFT, EBUS_RCLK, 0));
Modified: stable/7/sys/dev/uart/uart_cpu_sparc64.c
==============================================================================
--- stable/7/sys/dev/uart/uart_cpu_sparc64.c Mon Jul 25 17:37:53 2011 (r224350)
+++ stable/7/sys/dev/uart/uart_cpu_sparc64.c Mon Jul 25 17:37:54 2011 (r224351)
@@ -230,7 +230,8 @@ uart_cpu_getdev(int devtype, struct uart
di->bas.regshft = 0;
di->bas.rclk = 0;
class = NULL;
- if (!strcmp(buf, "se") || !strcmp(compat, "sab82532")) {
+ if (!strcmp(buf, "se") || !strcmp(buf, "FJSV,se") ||
+ !strcmp(compat, "sab82532")) {
class = &uart_sab82532_class;
/* SAB82532 are only known to be used for TTYs. */
if ((di->bas.chan = uart_cpu_channel(dev)) == 0)
More information about the svn-src-all
mailing list