From owner-svn-src-head@FreeBSD.ORG  Wed Dec 23 22:31:44 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0A67A106568B;
	Wed, 23 Dec 2009 22:31:44 +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 ED27C8FC1D;
	Wed, 23 Dec 2009 22:31:43 +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 nBNMVhsf011247;
	Wed, 23 Dec 2009 22:31:43 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBNMVhd0011244;
	Wed, 23 Dec 2009 22:31:43 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <200912232231.nBNMVhd0011244@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 23 Dec 2009 22:31:43 +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: r200926 - head/sys/dev/uart
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2009 22:31:44 -0000

Author: marius
Date: Wed Dec 23 22:31:43 2009
New Revision: 200926
URL: http://svn.freebsd.org/changeset/base/200926

Log:
  Recognize the NS16552 found in PCIe-based sun4u machines.

Modified:
  head/sys/dev/uart/uart_bus_ebus.c
  head/sys/dev/uart/uart_cpu_sparc64.c

Modified: head/sys/dev/uart/uart_bus_ebus.c
==============================================================================
--- head/sys/dev/uart/uart_bus_ebus.c	Wed Dec 23 22:25:23 2009	(r200925)
+++ head/sys/dev/uart/uart_bus_ebus.c	Wed Dec 23 22:31:43 2009	(r200926)
@@ -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: head/sys/dev/uart/uart_cpu_sparc64.c
==============================================================================
--- head/sys/dev/uart/uart_cpu_sparc64.c	Wed Dec 23 22:25:23 2009	(r200925)
+++ head/sys/dev/uart/uart_cpu_sparc64.c	Wed Dec 23 22:31:43 2009	(r200926)
@@ -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;
 	}