From owner-svn-src-projects@FreeBSD.ORG  Sat Mar  3 01:26:14 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD4CE106566B;
	Sat,  3 Mar 2012 01:26:14 +0000 (UTC)
	(envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ACFD08FC12;
	Sat,  3 Mar 2012 01:26:14 +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 q231QE4L056532;
	Sat, 3 Mar 2012 01:26:14 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q231QEms056530;
	Sat, 3 Mar 2012 01:26:14 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201203030126.q231QEms056530@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Sat, 3 Mar 2012 01:26:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232425 - projects/armv6/sys/arm/ti
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Mar 2012 01:26:14 -0000

Author: cognet
Date: Sat Mar  3 01:26:14 2012
New Revision: 232425
URL: http://svn.freebsd.org/changeset/base/232425

Log:
  For the global timer, use GBL_TIMER_CTRL, not PRV_TIMER_CTRL.
  It's harmless because both values are the same.

Modified:
  projects/armv6/sys/arm/ti/mp_timer.c

Modified: projects/armv6/sys/arm/ti/mp_timer.c
==============================================================================
--- projects/armv6/sys/arm/ti/mp_timer.c	Sat Mar  3 01:24:19 2012	(r232424)
+++ projects/armv6/sys/arm/ti/mp_timer.c	Sat Mar  3 01:26:14 2012	(r232425)
@@ -308,7 +308,7 @@ arm_tmr_attach(device_t dev)
 
 	/* Disable both timers to start off */
 	tmr_prv_write_4(PRV_TIMER_CTRL, 0x00000000);
-	tmr_gbl_write_4(PRV_TIMER_CTRL, 0x00000000);
+	tmr_gbl_write_4(GBL_TIMER_CTRL, 0x00000000);
 
 	/* Setup and enable the global timer to use as the timecounter */
 	tmr_gbl_write_4(GBL_TIMER_CTRL, (0x00 << GBL_TIMER_CTR_PRESCALER_SHIFT) |