From owner-p4-projects@FreeBSD.ORG  Fri Feb 24 17:51:44 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 10D2216A434; Fri, 24 Feb 2006 17:51:43 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EFA0E16A422
	for <perforce@freebsd.org>; Fri, 24 Feb 2006 17:51:40 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 93CEA43D48
	for <perforce@freebsd.org>; Fri, 24 Feb 2006 17:51:40 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1OHpeh3012800
	for <perforce@freebsd.org>; Fri, 24 Feb 2006 17:51:40 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OHpeoO012797
	for perforce@freebsd.org; Fri, 24 Feb 2006 17:51:40 GMT
	(envelope-from marcel@freebsd.org)
Date: Fri, 24 Feb 2006 17:51:40 GMT
Message-Id: <200602241751.k1OHpeoO012797@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 92349 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Feb 2006 17:51:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=92349

Change 92349 by marcel@marcel_nfs on 2006/02/24 17:51:01

	Merge from uart(4): Recognize the SAB82532 in USIII machines.

Affected files ...

.. //depot/projects/uart/dev/scc/scc_bfe_ebus.c#3 edit

Differences ...

==== //depot/projects/uart/dev/scc/scc_bfe_ebus.c#3 (text+ko) ====

@@ -46,11 +46,14 @@
 scc_ebus_probe(device_t dev)
 {
 	struct scc_softc *sc;
-	const char *nm;
+	const char *cmpt, *nm;
 
 	sc = device_get_softc(dev);
 	nm = ofw_bus_get_name(dev);
-	if (!strcmp(nm, "se")) {
+	cmpt = ofw_bus_get_compat(dev);
+	if (cmpt == NULL)
+		cmpt = "";
+	if (!strcmp(nm, "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));