PERFORCE change 109671 for review

[Sam Leffler]

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

Change 109671 by sam at 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))