From owner-svn-src-stable-8@FreeBSD.ORG Mon Jul 25 17:37:53 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B065D106566B; Mon, 25 Jul 2011 17:37:53 +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 869B98FC16; Mon, 25 Jul 2011 17:37:53 +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 p6PHbrE3068057; Mon, 25 Jul 2011 17:37:53 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6PHbrMA068054; Mon, 25 Jul 2011 17:37:53 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201107251737.p6PHbrMA068054@svn.freebsd.org> From: Marius Strobl Date: Mon, 25 Jul 2011 17:37:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224350 - in stable/8/sys/dev: scc uart X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jul 2011 17:37:53 -0000 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)