From owner-p4-projects@FreeBSD.ORG  Tue Feb 21 19:04:39 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 8436E16A423; Tue, 21 Feb 2006 19:04:39 +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 5ED4D16A420
	for <perforce@freebsd.org>; Tue, 21 Feb 2006 19:04:39 +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 AA50F43D90
	for <perforce@freebsd.org>; Tue, 21 Feb 2006 19:04:30 +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 k1LJ4Uhw059329
	for <perforce@freebsd.org>; Tue, 21 Feb 2006 19:04:30 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LJ4Uga059326
	for perforce@freebsd.org; Tue, 21 Feb 2006 19:04:30 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 21 Feb 2006 19:04:30 GMT
Message-Id: <200602211904.k1LJ4Uga059326@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 92137 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, 21 Feb 2006 19:04:40 -0000

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

Change 92137 by imp@imp_Speedy on 2006/02/21 19:03:49

	Initialize more of the clocks.  We now hang when reading the
	ohci version number.  More to follow.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#8 edit

Differences ...

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

@@ -250,7 +250,9 @@
 	int freq;
 
 	sc->main_clock_hz = main_clock;
-	
+	main_ck.hz = main_clock;
+	plla.hz = at91_pmc_pll_rate(main_clock, RD4(sc, CKGR_PLLAR), 0);
+
 	/*
 	 * Initialize the usb clock.  This sets up pllb, but disables the
 	 * actual clock.
@@ -267,20 +269,21 @@
 	 * this relationship.
 	 */
 	mckr = RD4(sc, PMC_MCKR);
+	printf("mckr is %x\n", mckr);
 	mck.parent = clock_list[mckr & 0x3];
 	mck.parent->refcnt++;
 	freq = mck.parent->hz;
 	freq /= 1 << ((mckr >> 2) & 3);
 	mck.hz = freq / (1 + ((mckr >> 8) & 3));
 
-	printf("Main clock is %x\n", RD4(sc, PMC_MCKR));
-
-	device_printf(sc->dev, "main clock = %d Hz PLLA = %d Hz CPU %d Hz main %d Hz\n",
+	device_printf(sc->dev,
+	    "main clock: %d Hz PLLA: %d MHz CPU: %d MHz main %d MHz\n",
 	    sc->main_clock_hz,
-	    at91_pmc_pll_rate(main_clock, RD4(sc, CKGR_PLLAR), 0),
-	    freq, mck.hz);
+	    at91_pmc_pll_rate(main_clock, RD4(sc, CKGR_PLLAR), 0) / 1000000,
+	    freq / 1000000, mck.hz / 1000000);
 	WR4(sc, PMC_SCDR, PMC_SCER_PCK0 | PMC_SCER_PCK1 | PMC_SCER_PCK2 |
 	    PMC_SCER_PCK3);
+	WR4(sc, PMC_PCER, 0xffffffff);
 }
 
 static void