From owner-svn-src-head@FreeBSD.ORG  Sat Feb  1 17:53:36 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 ESMTPS id 801211A2;
 Sat,  1 Feb 2014 17:53:36 +0000 (UTC)
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 6CF1410CE;
 Sat,  1 Feb 2014 17:53:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s11HrapM090550;
 Sat, 1 Feb 2014 17:53:36 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s11HraPB090548;
 Sat, 1 Feb 2014 17:53:36 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201402011753.s11HraPB090548@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 1 Feb 2014 17:53:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261353 - head/sys/arm/at91
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.17
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: Sat, 01 Feb 2014 17:53:36 -0000

Author: imp
Date: Sat Feb  1 17:53:35 2014
New Revision: 261353
URL: http://svnweb.freebsd.org/changeset/base/261353

Log:
  Fix AT91SAM9260 to work with PA rather than VA device addresses.

Modified:
  head/sys/arm/at91/at91sam9260reg.h

Modified: head/sys/arm/at91/at91sam9260reg.h
==============================================================================
--- head/sys/arm/at91/at91sam9260reg.h	Sat Feb  1 17:41:54 2014	(r261352)
+++ head/sys/arm/at91/at91sam9260reg.h	Sat Feb  1 17:53:35 2014	(r261353)
@@ -251,12 +251,12 @@
  * other * soc's so phyical and vm address
  * mapping are unique. XXX
  */
-#define AT91SAM9260_OHCI_BASE	  0xdfc00000
-#define AT91SAM9260_OHCI_PA_BASE  0x00500000
+#define AT91SAM9260_OHCI_VA_BASE  0xdfc00000
+#define AT91SAM9260_OHCI_BASE     0x00500000
 #define AT91SAM9260_OHCI_SIZE	  0x00100000
 
-#define AT91SAM9260_NAND_BASE     0xe0000000
-#define AT91SAM9260_NAND_PA_BASE  0x40000000
+#define AT91SAM9260_NAND_VA_BASE  0xe0000000
+#define AT91SAM9260_NAND_BASE     0x40000000
 #define AT91SAM9260_NAND_SIZE     0x10000000