From owner-p4-projects@FreeBSD.ORG  Fri Nov 10 05:34:45 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 3FECA16A40F; Fri, 10 Nov 2006 05:34:45 +0000 (UTC)
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 B6D6816A403
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 05:34:44 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 87EDC43D45
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 05:34:44 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAA5Yi2L033237
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 05:34:44 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAA5YiPZ033234
	for perforce@freebsd.org; Fri, 10 Nov 2006 05:34:44 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 10 Nov 2006 05:34:44 GMT
Message-Id: <200611100534.kAA5YiPZ033234@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109670 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: Fri, 10 Nov 2006 05:34:45 -0000

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

Change 109670 by sam@sam_ebb on 2006/11/10 05:34:02

	add defs for expansion bus data areas; define mapping
	for cs1 where the avila cf-ide is located

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#5 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#5 (text+ko) ====

@@ -277,7 +277,7 @@
 #define	GPIO_TYPE_REG(b)	(((b)&8)?IXP425_GPIO_GPIT2R:IXP425_GPIO_GPIT1R)
 
 /*
- * Expansion Bus
+ * Expansion Bus Configuration Space.
  */
 #define	IXP425_EXP_HWBASE	0xc4000000UL
 #define	IXP425_EXP_VBASE	(IXP425_IO_VBASE + IXP425_IO_SIZE)
@@ -547,4 +547,26 @@
 #define IXP425_MAC_B_VBASE	(IXP425_IO_VBASE + IXP425_MAC_B_OFFSET)
 #define IXP425_MAC_B_SIZE	0x1000 		/* Actually only 256 bytes */
 
+/*
+ * Expansion Bus Data Space.
+ */
+#define	IXP425_EXP_BUS_HWBASE	0x50000000UL
+#define	IXP425_EXP_BUS_SIZE	0x01000000	/* max, typically smaller */
+
+#define	IXP425_EXP_BUS_CSx_HWBASE(i) \
+	(IXP425_EXP_BUS_HWBASE + (i)*IXP425_EXP_BUS_SIZE)
+
+#define	IXP425_EXP_BUS_CS1_HWBASE	IXP425_EXP_BUS_CSx_HWBASE(1)
+#define IXP425_EXP_BUS_CS1_VBASE	(IXP425_MAC_B_VBASE + IXP425_MAC_B_SIZE)
+#define IXP425_EXP_BUS_CS1_SIZE		0x1000
+
+/* NB: not mapped (yet) */
+#define	IXP425_EXP_BUS_CS0_HWBASE	IXP425_EXP_BUS_CSx_HWBASE(0)
+#define	IXP425_EXP_BUS_CS2_HWBASE	IXP425_EXP_BUS_CSx_HWBASE(2)
+#define	IXP425_EXP_BUS_CS3_HWBASE	IXP425_EXP_BUS_CSx_HWBASE(3)
+#define	IXP425_EXP_BUS_CS4_HWBASE	IXP425_EXP_BUS_CSx_HWBASE(4)
+#define	IXP425_EXP_BUS_CS5_HWBASE	IXP425_EXP_BUS_CSx_HWBASE(5)
+#define	IXP425_EXP_BUS_CS6_HWBASE	IXP425_EXP_BUS_CSx_HWBASE(6)
+#define	IXP425_EXP_BUS_CS7_HWBASE	IXP425_EXP_BUS_CSx_HWBASE(7)
+
 #endif /* _IXP425REG_H_ */