From owner-p4-projects@FreeBSD.ORG  Mon Feb 13 21:17:38 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 6E38416A455; Mon, 13 Feb 2006 21:17:36 +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 00A2B16A420
	for <perforce@freebsd.org>; Mon, 13 Feb 2006 21:17:36 +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 C15F343D55
	for <perforce@freebsd.org>; Mon, 13 Feb 2006 21:17:35 +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 k1DLHZT6025820
	for <perforce@freebsd.org>; Mon, 13 Feb 2006 21:17:35 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DLHZPi025817
	for perforce@freebsd.org; Mon, 13 Feb 2006 21:17:35 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 13 Feb 2006 21:17:35 GMT
Message-Id: <200602132117.k1DLHZPi025817@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 91697 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: Mon, 13 Feb 2006 21:17:38 -0000

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

Change 91697 by imp@imp_Speedy on 2006/02/13 21:17:34

	PA == VA for usb ohci controller, for the moment.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#16 edit

Differences ...

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

@@ -146,25 +146,36 @@
 	 * Map the on-board devices VA == PA so that we can access them
 	 * with the MMU on or off.
 	 */
-	    {
-		    /*
-		     * This at least maps the interrupt controller, the UART
-		     * and the timer. Other devices should use newbus to
-		     * map their memory anyway.
-		     */
-		    0xfff00000,
-		    0xfff00000,
-		    0x100000,
-		    VM_PROT_READ|VM_PROT_WRITE,                             
-		    PTE_NOCACHE,
-	    },
-	    {
-		    0,
-		    0,
-		    0,
-		    0,
-		    0,
-	    }
+	{
+		/*
+		 * This at least maps the interrupt controller, the UART
+		 * and the timer. Other devices should use newbus to
+		 * map their memory anyway.
+		 */
+		0xfff00000,
+		0xfff00000,
+		0x100000,
+		VM_PROT_READ|VM_PROT_WRITE,                             
+		PTE_NOCACHE,
+	},
+	{
+		/*
+		 * Add the ohci controller, and anything else that might be
+		 * on this chip select for a VA/PA mapping.
+		 */
+		AT91RM92_OHCI_BASE,
+		AT91RM92_OHCI_BASE,
+		AT91RM92_OHCI_SIZE,
+		VM_PROT_READ|VM_PROT_WRITE,                             
+		PTE_NOCACHE,
+	},
+	{
+		0,
+		0,
+		0,
+		0,
+		0,
+	}
 };
 
 #define SDRAM_START 0xa0000000