Author: marius
Date: Mon Jul 25 17:37:53 2011
New Revision: 224350
URL: http://svn.freebsd.org/changeset/base/224350

Log:
  MFC: r221960
  
  Recognize the SAB 82532 found in Fujitsu PRIMEPOWER650 and 900.

Modified:
  stable/8/sys/dev/scc/scc_bfe_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/geom/label/   (props changed)

Modified: stable/8/sys/dev/scc/scc_bfe_ebus.c
==============================================================================
--- stable/8/sys/dev/scc/scc_bfe_ebus.c Mon Jul 25 17:32:22 2011        
(r224349)
+++ stable/8/sys/dev/scc/scc_bfe_ebus.c Mon Jul 25 17:37:53 2011        
(r224350)
@@ -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/8/sys/dev/uart/uart_cpu_sparc64.c
==============================================================================
--- stable/8/sys/dev/uart/uart_cpu_sparc64.c    Mon Jul 25 17:32:22 2011        
(r224349)
+++ stable/8/sys/dev/uart/uart_cpu_sparc64.c    Mon Jul 25 17:37:53 2011        
(r224350)
@@ -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)
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to