From owner-svn-src-all@FreeBSD.ORG  Sat Sep 21 19:42:37 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id C74F1771;
 Sat, 21 Sep 2013 19:42:37 +0000 (UTC)
 (envelope-from adrian@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 B1E80253C;
 Sat, 21 Sep 2013 19:42:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8LJgbUv025342;
 Sat, 21 Sep 2013 19:42:37 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8LJgb3T025341;
 Sat, 21 Sep 2013 19:42:37 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201309211942.r8LJgb3T025341@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 21 Sep 2013 19:42:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255764 - head/sys/mips/atheros
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Sep 2013 19:42:37 -0000

Author: adrian
Date: Sat Sep 21 19:42:37 2013
New Revision: 255764
URL: http://svnweb.freebsd.org/changeset/base/255764

Log:
  Fix the AR933x CPU UART support by using the correct clock when calculating
  the UART frequency.
  
  Tested:
  
  * AR933x (carambola 2 board), UART now works again
  
  Approved by:	re

Modified:
  head/sys/mips/atheros/ar933x_chip.c

Modified: head/sys/mips/atheros/ar933x_chip.c
==============================================================================
--- head/sys/mips/atheros/ar933x_chip.c	Sat Sep 21 16:46:34 2013	(r255763)
+++ head/sys/mips/atheros/ar933x_chip.c	Sat Sep 21 19:42:37 2013	(r255764)
@@ -115,8 +115,14 @@ ar933x_chip_detect_sys_frequency(void)
 		u_ar71xx_ahb_freq = freq / t;
 	}
 
-	/* XXX uart should be the refclk, no? */
-	u_ar71xx_uart_freq = u_ar71xx_ahb_freq;
+	/* On the AR933x, the UART frequency is the reference clock,
+	 * not the AHB bus clock.
+	 */
+	u_ar71xx_uart_freq = u_ar71xx_refclk;
+
+	/*
+	 * XXX check what the watchdog frequency should be?
+	 */
 	u_ar71xx_wdt_freq = u_ar71xx_ahb_freq;
 }