From owner-svn-src-all@FreeBSD.ORG  Fri Mar  5 19:45:46 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 39E63106566B;
	Fri,  5 Mar 2010 19:45:46 +0000 (UTC) (envelope-from raj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 28DBB8FC19;
	Fri,  5 Mar 2010 19:45:46 +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 o25Jjkdg093566;
	Fri, 5 Mar 2010 19:45:46 GMT (envelope-from raj@svn.freebsd.org)
Received: (from raj@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o25Jjk7t093563;
	Fri, 5 Mar 2010 19:45:46 GMT (envelope-from raj@svn.freebsd.org)
Message-Id: <201003051945.o25Jjk7t093563@svn.freebsd.org>
From: Rafal Jaworowski <raj@FreeBSD.org>
Date: Fri, 5 Mar 2010 19:45:46 +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: r204764 - in head/sys/arm/mv: . kirkwood
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: Fri, 05 Mar 2010 19:45:46 -0000

Author: raj
Date: Fri Mar  5 19:45:45 2010
New Revision: 204764
URL: http://svn.freebsd.org/changeset/base/204764

Log:
  Provide correct TCLK value for Kirkwood A1 silicon revision.
  
  While there improve SOC ID output accordingly.
  
  Obtained from:	Semihalf
  MFC after:	1 week

Modified:
  head/sys/arm/mv/common.c
  head/sys/arm/mv/kirkwood/kirkwood.c

Modified: head/sys/arm/mv/common.c
==============================================================================
--- head/sys/arm/mv/common.c	Fri Mar  5 17:53:28 2010	(r204763)
+++ head/sys/arm/mv/common.c	Fri Mar  5 19:45:45 2010	(r204764)
@@ -261,6 +261,8 @@ soc_identify(void)
 			rev = "Z0";
 		else if (r == 2)
 			rev = "A0";
+		else if (r == 3)
+			rev = "A1";
 		break;
 	case MV_DEV_MV78100_Z0:
 		dev = "Marvell MV78100 Z0";

Modified: head/sys/arm/mv/kirkwood/kirkwood.c
==============================================================================
--- head/sys/arm/mv/kirkwood/kirkwood.c	Fri Mar  5 17:53:28 2010	(r204763)
+++ head/sys/arm/mv/kirkwood/kirkwood.c	Fri Mar  5 19:45:45 2010	(r204764)
@@ -176,11 +176,11 @@ get_tclk(void)
 	/*
 	 * On Kirkwood TCLK is not configurable and depends on silicon
 	 * revision:
-	 * - A0 has TCLK hardcoded to 200 MHz.
+	 * - A0 and A1 have TCLK hardcoded to 200 MHz.
 	 * - Z0 and others have TCLK hardcoded to 166 MHz.
 	 */
 	soc_id(&dev, &rev);
-	if (dev == MV_DEV_88F6281 && rev == 2)
+	if (dev == MV_DEV_88F6281 && (rev == 2 || rev == 3))
 		return (TCLK_200MHZ);
 
 	return (TCLK_166MHZ);