diff --git a/include/arm/pxa2x0/dma.h b/include/arm/pxa2x0/dma.h
index 9bf0f875..c101ce5a 100644
--- a/include/arm/pxa2x0/dma.h
+++ b/include/arm/pxa2x0/dma.h
@@ -24,22 +24,23 @@
  * Documentation:
  * [1] Intel Corporation, "Intel PXA250 and PXA210 Application Processors
  *     Developer's Manual", February 2002, Order Number: 278522-001
- * [2] Intel Corporation, "Intel PXA250 and PXA210 Application Processors
- *     Specification Update", May 2002, Order Number: 278534-005
  *
  */
 
 #ifndef	PXA2X0_DMA_H
 #define	PXA2X0_DMA_H
 
-#ifndef uint32_t
-typedef	unsigned int	uint32_t;
+#include <common.h>
+
+#if LANGUAGE == C
+#include <stdint.h>
 #endif
 
 /* DMA Controller Registers */
 
 #define	DMA_BASE	0x40000000
 
+#if LANGUAGE == C
 typedef struct _DMA_dar {
 	uint32_t ddadr;
 	uint32_t dsadr;
@@ -57,16 +58,62 @@ typedef volatile struct DMA_registers {
 	_DMA_dar dar[16];
 } DMA_registers;
 
-#ifndef DMA_pointer
-#define	DMA_pointer	((DMA_registers*) DMA_BASE)
+#ifdef PXA2X0_UNMAPPED
+#define	DMA_pointer		((DMA_registers*) DMA_BASE)
 #endif
 
-#define	DCSR(i)		DMA_pointer->dcsr[i]
-#define	DINT		DMA_pointer->dint
-#define	DRCMR(i)	DMA_pointer->drcmr[i]
-#define	DDADR(i)	DMA_pointer->dar[i].ddadr
-#define	DSADR(i)	DMA_pointer->dar[i].dsadr
-#define	DTADR(i)	DMA_pointer->dar[i].dtadr
-#define	DCMD(i)		DMA_pointer->dar[i].dcmd
+#define	DCSR(i)			DMA_pointer->dcsr[i]
+#define	DINT			DMA_pointer->dint
+#define	DRCMR(i)		DMA_pointer->drcmr[i]
+#define	DDADR(i)		DMA_pointer->dar[i].ddadr
+#define	DSADR(i)		DMA_pointer->dar[i].dsadr
+#define	DTADR(i)		DMA_pointer->dar[i].dtadr
+#define	DCMD(i)			DMA_pointer->dar[i].dcmd
+#endif /* LANGUAGE == C */
+
+#define	DCSR_OFFSET(i)		(i << 2)
+#define	DINT_OFFSET		0xF0
+#define	DRCMR_OFFSET(i)		(0x100 + (i << 2))
+#define	DDADR_OFFSET(i)		(0x200 + (i << 4))
+#define	DSADR_OFFSET(i)		(0x204 + (i << 4))
+#define	DTADR_OFFSET(i)		(0x208 + (i << 4))
+#define	DCMD_OFFSET(i)		(0x20C + (i << 4))
+
+/* DCSRx bits - see Table 5-7 in [1] */
+
+#define	DCSR_RUN		bit(31)
+#define	DCSR_NODESCFETCH	bit(30)
+#define	DCSR_STOPIRQEN		bit(29)
+#define	DCSR_REQPEND		bit(8)
+#define	DCSR_STOPSTATE		bit(3)
+#define	DCSR_ENDINTR		bit(2)
+#define	DCSR_STARTINTR		bit(1)
+#define	DSCR_BUSERRINTR		bit(0)
+
+/* DRCMRx bits - see Table 5-8 in [1] */
+
+#define	DRCMR_MAPVLD		bit(7)
+#define	DRCMR_CHLNUM_MASK	0x0000000F
+#define	DRCMR_CHLNUM(x)		(x & DRCMR_CHLNUM_MASK)
+
+/* DDADRx bits - see Table 5-9 in [1] */
+
+#define	DDADR_STOP		bit(0)
+
+/* DCMDx bits - see Table 5-12 in [1] */
+
+#define	DCMD_INCSRCADDR		bit(31)
+#define	DCMD_INCTRGADDR		bit(30)
+#define	DCMD_FLOWSRC		bit(29)
+#define	DCMD_FLOWTRG		bit(28)
+#define	DCMD_STARTIRQEN		bit(22)
+#define	DCMD_ENDIRQEN		bit(21)
+#define	DCMD_ENDIAN		bit(18)
+#define	DCMD_SIZE_MASK		0x00030000
+#define	DCMD_SIZE(x)		((x << 16) & DCMD_SIZE_MASK)
+#define	DCMD_WIDTH_MASK		0x0000C000
+#define	DCMD_WIDTH(x)		((x << 14) & DCMD_WIDTH_MASK)
+#define	DCMD_LENGTH_MASK	0x00001FFF
+#define	DCMD_LENGTH(x)		(x & DCMD_LENGTH_MASK)
 
-#endif	/* PXA2X0_DMA_H */
+#endif /* PXA2X0_DMA_H */