From owner-p4-projects@FreeBSD.ORG  Fri Nov 10 05:35:46 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 7EC9516A47C; Fri, 10 Nov 2006 05:35:46 +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 52B7316A417
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 05:35:46 +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 22BB843D46
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 05:35:46 +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 kAA5ZkTO033310
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 05:35:46 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAA5Zjwg033307
	for perforce@freebsd.org; Fri, 10 Nov 2006 05:35:45 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 10 Nov 2006 05:35:45 GMT
Message-Id: <200611100535.kAA5Zjwg033307@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 109671 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:35:46 -0000

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

Change 109671 by sam@sam_ebb on 2006/11/10 05:34:47

	o define mapping for expansion bus cs1
	o correct comments for npe assignments
	o enumerate avila_ata driver

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#17 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#17 (text+ko) ====

@@ -83,6 +83,9 @@
 	{ IXP425_NPE_C_HWBASE,	IXP425_NPE_C_SIZE,	IXP425_NPE_C_VBASE },
 	{ IXP425_MAC_A_HWBASE,	IXP425_MAC_A_SIZE,	IXP425_MAC_A_VBASE },
 	{ IXP425_MAC_B_HWBASE,	IXP425_MAC_B_SIZE,	IXP425_MAC_B_VBASE },
+	/* Gateworks Avila IDE/CF is mapped here */
+	{ IXP425_EXP_BUS_CS1_HWBASE, IXP425_EXP_BUS_SIZE,
+	  IXP425_EXP_BUS_CS1_VBASE },
 };
 
 static int
@@ -226,8 +229,9 @@
 	device_add_child(dev, "uart", 0);
 	/* XXX these are optional, what if they are not configured? */
 	device_add_child(dev, "ixpqmgr", 0);
-	device_add_child(dev, "npe", 0);	/* NPE-A */
-	device_add_child(dev, "npe", 1);	/* NPE-B */
+	device_add_child(dev, "npe", 0);	/* NPE-B */
+	device_add_child(dev, "npe", 1);	/* NPE-C */
+	device_add_child(dev, "ata_avila", 0);	/* XXX */
 
 	if (bus_space_map(sc->sc_iot, IXP425_GPIO_HWBASE, IXP425_GPIO_SIZE,
 	    0, &sc->sc_gpio_ioh))