From owner-svn-src-all@FreeBSD.ORG  Thu May 26 20:54:45 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 A71DC106566C;
	Thu, 26 May 2011 20:54:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 97E258FC12;
	Thu, 26 May 2011 20:54:45 +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 p4QKsjCC080498;
	Thu, 26 May 2011 20:54:45 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4QKsjN3080496;
	Thu, 26 May 2011 20:54:45 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201105262054.p4QKsjN3080496@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 26 May 2011 20:54:45 +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: r222328 - head/sys/dev/puc
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: Thu, 26 May 2011 20:54:45 -0000

Author: jhb
Date: Thu May 26 20:54:45 2011
New Revision: 222328
URL: http://svn.freebsd.org/changeset/base/222328

Log:
  For Timedia multiport serial adapters, the first two ports use a SUN1889
  which uses a non-standard clock (* 8) while any additional ports use
  SUN1699 chips which use a standard clock.
  
  Tested by:	N.J. Mann   njm of njm me uk
  MFC after:	1 week

Modified:
  head/sys/dev/puc/pucdata.c

Modified: head/sys/dev/puc/pucdata.c
==============================================================================
--- head/sys/dev/puc/pucdata.c	Thu May 26 20:47:05 2011	(r222327)
+++ head/sys/dev/puc/pucdata.c	Thu May 26 20:54:45 2011	(r222328)
@@ -1292,6 +1292,12 @@ puc_config_timedia(struct puc_softc *sc,
 	uint16_t subdev;
 
 	switch (cmd) {
+	case PUC_CFG_GET_CLOCK:
+		if (port < 2)
+			*res = DEFAULT_RCLK * 8;
+		else
+			*res = DEFAULT_RCLK;
+		return (0);
 	case PUC_CFG_GET_DESC:
 		snprintf(desc, sizeof(desc),
 		    "Timedia technology %d Port Serial", (int)sc->sc_cfg_data);