From owner-svn-src-all@FreeBSD.ORG  Sun May 15 13:27:39 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0728C106564A;
	Sun, 15 May 2011 13:27:39 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EB4248FC12;
	Sun, 15 May 2011 13:27:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4FDRcO9040742;
	Sun, 15 May 2011 13:27:38 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4FDRcZi040739;
	Sun, 15 May 2011 13:27:38 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201105151327.p4FDRcZi040739@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 15 May 2011 13:27:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221960 - in head/sys/dev: scc uart
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 May 2011 13:27:39 -0000

Author: marius
Date: Sun May 15 13:27:38 2011
New Revision: 221960
URL: http://svn.freebsd.org/changeset/base/221960

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

Modified:
  head/sys/dev/scc/scc_bfe_ebus.c
  head/sys/dev/uart/uart_cpu_sparc64.c

Modified: head/sys/dev/scc/scc_bfe_ebus.c
==============================================================================
--- head/sys/dev/scc/scc_bfe_ebus.c	Sun May 15 13:27:28 2011	(r221959)
+++ head/sys/dev/scc/scc_bfe_ebus.c	Sun May 15 13:27:38 2011	(r221960)
@@ -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: head/sys/dev/uart/uart_cpu_sparc64.c
==============================================================================
--- head/sys/dev/uart/uart_cpu_sparc64.c	Sun May 15 13:27:28 2011	(r221959)
+++ head/sys/dev/uart/uart_cpu_sparc64.c	Sun May 15 13:27:38 2011	(r221960)
@@ -238,7 +238,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)