From owner-p4-projects@FreeBSD.ORG  Sun Feb 19 08:03:10 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 AE0ED16A423; Sun, 19 Feb 2006 08:03:09 +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 804A516A420
	for <perforce@freebsd.org>; Sun, 19 Feb 2006 08:03:09 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4CD8343D45
	for <perforce@freebsd.org>; Sun, 19 Feb 2006 08:03:09 +0000 (GMT)
	(envelope-from imp@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 k1J838OO009529
	for <perforce@freebsd.org>; Sun, 19 Feb 2006 08:03:09 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1J838Pv009526
	for perforce@freebsd.org; Sun, 19 Feb 2006 08:03:08 GMT
	(envelope-from imp@freebsd.org)
Date: Sun, 19 Feb 2006 08:03:08 GMT
Message-Id: <200602190803.k1J838Pv009526@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 92031 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: Sun, 19 Feb 2006 08:03:10 -0000

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

Change 92031 by imp@imp_plunger on 2006/02/19 08:02:58

	More constants.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#6 edit
.. //depot/projects/arm/src/sys/arm/at91/at91_pmcreg.h#3 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#6 (text+ko) ====

@@ -196,10 +196,9 @@
 at91_pmc_pll_calc(uint32_t main_freq, uint32_t out_freq)
 {
         uint32_t i, div = 0, mul = 0, diff = 1 << 30;
-        unsigned ret = (out_freq > 155000000) ? 0xbe00 : 0x3e00; 
+        unsigned ret = (out_freq > PMC_PLL_FAST_THRESH) ? 0xbe00 : 0x3e00; 
 
-        /* PLL output max 240 MHz (or 180 MHz per errata) */
-        if (out_freq > 240000000)
+        if (out_freq > PMC_PLL_MAX_OUT_FREQ)
                 goto fail;
 
         for (i = 1; i < 256; i++) {

==== //depot/projects/arm/src/sys/arm/at91/at91_pmcreg.h#3 (text+ko) ====

@@ -104,9 +104,17 @@
 #define PMC_PLL_MIN_IN_FREQ	100000
 #define PMC_PLL_MAX_IN_FREQ	32000000
 
+/*
+ * PLL Max output frequency is 240MHz.  The errata says 180MHz is the max
+ * for some revisions of this part.  Be more permissive and optimistic.
+ */
+#define PMC_PLL_MAX_OUT_FREQ	240000000
+
 #define PMC_PLL_MULT_MIN	2
 #define PMC_PLL_MULT_MAX	2048
 
 #define PMC_PLL_SHIFT_TOL	5	/* Allow errors 1 part in 32 */
 
+#define PMC_PLL_FAST_THRESH	155000000
+
 #endif /* ARM_AT91_AT91_PMCREG_H */