From owner-p4-projects@FreeBSD.ORG  Tue Apr 11 16:06:26 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 233D816A407; Tue, 11 Apr 2006 16:06:26 +0000 (UTC)
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 DDD3B16A405
	for <perforce@freebsd.org>; Tue, 11 Apr 2006 16:06:25 +0000 (UTC)
	(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 8818843D5A
	for <perforce@freebsd.org>; Tue, 11 Apr 2006 16:06:25 +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 k3BG6PjP080578
	for <perforce@freebsd.org>; Tue, 11 Apr 2006 16:06:25 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BG6Pnu080575
	for perforce@freebsd.org; Tue, 11 Apr 2006 16:06:25 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 11 Apr 2006 16:06:25 GMT
Message-Id: <200604111606.k3BG6Pnu080575@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 94990 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: Tue, 11 Apr 2006 16:06:26 -0000

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

Change 94990 by imp@imp_hammer on 2006/04/11 16:05:44

	Tweak for KB920x board.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#8 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#8 (text+ko) ====

@@ -63,10 +63,10 @@
 	//    CSS = PLLB
 	
 	// Crude selection between 16MHz clock and 10MHz clock.
-	if (AT91C_BASE_CKGR->CKGR_MCFR & AT91C_CKGR_MAINF < 6000)
+//	if (AT91C_BASE_CKGR->CKGR_MCFR & AT91C_CKGR_MAINF < 6000)
 		div = OSC_MAIN_FREQ_DIV_10;
-	else
-		div = OSC_MAIN_FREQ_DIV_16;
+//	else
+//		div = OSC_MAIN_FREQ_DIV_16;
 	
 	// set PLLA = 180MHz
 	// assume main osc = 10Mhz
@@ -80,7 +80,7 @@
 	// mul = 90
 	value = AT91C_BASE_CKGR->CKGR_PLLAR;
 	value &= ~AT91C_CKGR_MULA;
-	value |= (OSC_MAIN_MULT -1) << 16;
+	value |= (OSC_MAIN_MULT - 1) << 16;
 	AT91C_BASE_CKGR->CKGR_PLLAR = value;
 
 	// wait for lock