From owner-svn-src-head@FreeBSD.ORG  Wed Oct 23 14:29:00 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id F2BC6C92;
 Wed, 23 Oct 2013 14:28:59 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DFFC92347;
 Wed, 23 Oct 2013 14:28:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NESxCJ006947;
 Wed, 23 Oct 2013 14:28:59 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NESxii006946;
 Wed, 23 Oct 2013 14:28:59 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201310231428.r9NESxii006946@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 23 Oct 2013 14:28:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256973 - head/sys/powerpc/booke
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 14:29:00 -0000

Author: nwhitehorn
Date: Wed Oct 23 14:28:59 2013
New Revision: 256973
URL: http://svnweb.freebsd.org/changeset/base/256973

Log:
  If the device tree directly contains the timebase frequency, use it. This
  property is required by ePAPR, but maintain the fallback to bus-frequency
  for compatibility.
  
  MFC after:	2 weeks

Modified:
  head/sys/powerpc/booke/platform_bare.c

Modified: head/sys/powerpc/booke/platform_bare.c
==============================================================================
--- head/sys/powerpc/booke/platform_bare.c	Wed Oct 23 14:28:42 2013	(r256972)
+++ head/sys/powerpc/booke/platform_bare.c	Wed Oct 23 14:28:59 2013	(r256973)
@@ -188,6 +188,10 @@ bare_timebase_freq(platform_t plat, stru
 	if ((child = OF_child(cpus)) == 0)
 		goto out;
 
+	if (OF_getprop(child, "timebase-frequency", (void *)&ticks,
+	    sizeof(ticks)) == sizeof(ticks))
+		goto out;
+
 	freq = 0;
 	if (OF_getprop(child, "bus-frequency", (void *)&freq,
 	    sizeof(freq)) <= 0)