PERFORCE change 109670 for review

[Sam Leffler]

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

Change 109670 by sam at 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_ */