From owner-svn-src-all@FreeBSD.ORG  Wed Jan 13 21:21:29 2010
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 8CB4B106566C;
	Wed, 13 Jan 2010 21:21:29 +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 61E4A8FC08;
	Wed, 13 Jan 2010 21:21:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DLLTH6028369;
	Wed, 13 Jan 2010 21:21:29 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0DLLTxF028366;
	Wed, 13 Jan 2010 21:21:29 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201001132121.o0DLLTxF028366@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 13 Jan 2010 21:21:29 +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: r202262 - stable/8/sys/dev/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: Wed, 13 Jan 2010 21:21:29 -0000

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;
 	}