diff --git a/include/arm/pxa2x0/ac97.h b/include/arm/pxa2x0/ac97.h
index 40d801e5..3f19b2d5 100644
--- a/include/arm/pxa2x0/ac97.h
+++ b/include/arm/pxa2x0/ac97.h
@@ -32,14 +32,17 @@
 #ifndef	PXA2X0_AC97_H
 #define	PXA2X0_AC97_H
 
-#ifndef uint32_t
-typedef	unsigned int	uint32_t;
+#include <common.h>
+
+#if LANGUAGE == C
+#include <stdint.h>
 #endif
 
 /* AC97 Registers */
 
 #define	AC97_BASE	0x40500000
 
+#if LANGUAGE == C
 typedef volatile struct AC97_registers {
 	uint32_t pocr;
 	uint32_t picr;
@@ -71,25 +74,125 @@ typedef volatile struct AC97_registers {
 	uint32_t __smcr[64];		/* Secondary Modem codec Registers */
 } AC97_registers;
 
-#ifndef AC97_pointer
-#define	AC97_pointer	((AC97_registers*) AC97_BASE)
+#ifdef PXA2X0_UNMAPPED
+#define	AC97_pointer		((AC97_registers*) AC97_BASE)
 #endif
 
-#define	POCR		AC97_pointer->pocr
-#define	PICR		AC97_pointer->picr
-#define	MCCR		AC97_pointer->mccr
-#define	GCR		AC97_pointer->gcr
-#define	POSR		AC97_pointer->posr
-#define	PISR		AC97_pointer->pisr
-#define	MCSR		AC97_pointer->mcsr
-#define	GSR		AC97_pointer->gsr
-#define	CAR		AC97_pointer->car
-#define	PCDR		AC97_pointer->pcdr
-#define	MCDR		AC97_pointer->mcdr
-#define	MOCR		AC97_pointer->mocr
-#define	MICR		AC97_pointer->micr
-#define	MOSR		AC97_pointer->mosr
-#define	MISR		AC97_pointer->misr
-#define	MODR		AC97_pointer->modr
-
-#endif	/* PXA2X0_AC97_H */
+#define	POCR			AC97_pointer->pocr
+#define	PICR			AC97_pointer->picr
+#define	MCCR			AC97_pointer->mccr
+#define	GCR			AC97_pointer->gcr
+#define	POSR			AC97_pointer->posr
+#define	PISR			AC97_pointer->pisr
+#define	MCSR			AC97_pointer->mcsr
+#define	GSR			AC97_pointer->gsr
+#define	CAR			AC97_pointer->car
+#define	PCDR			AC97_pointer->pcdr
+#define	MCDR			AC97_pointer->mcdr
+#define	MOCR			AC97_pointer->mocr
+#define	MICR			AC97_pointer->micr
+#define	MOSR			AC97_pointer->mosr
+#define	MISR			AC97_pointer->misr
+#define	MODR			AC97_pointer->modr
+#endif /* LANGUAGE == C */
+
+#define	POCR_OFFSET		0x000
+#define	PICR_OFFSET		0x004
+#define	MCCR_OFFSET		0x008
+#define	GCR_OFFSET		0x00C
+#define	POSR_OFFSET		0x010
+#define	PISR_OFFSET		0x014
+#define	MCSR_OFFSET		0x018
+#define	GSR_OFFSET		0x01C
+#define	CAR_OFFSET		0x020
+#define	PCDR_OFFSET		0x040
+#define	MCDR_OFFSET		0x060
+#define	MOCR_OFFSET		0x100
+#define	MICR_OFFSET		0x108
+#define	MOSR_OFFSET		0x110
+
+/* POCR bits - see Table 13-50 in [1] */
+
+#define	POCR_FEIE		bit(3)
+
+/* PICR bits - see Table 13-51 in [1] */
+
+#define	PICR_FEIE		bit(3)
+
+/* MCCR bits - see Table 13-56 in [1] */
+
+#define	MCCR_FEIE		bit(3)
+
+/* GCR bits - see Table 13-48 in [1] */
+
+#define	GCR_CDONE_IE		bit(19)
+#define	GCR_SDONE_IE		bit(18)
+#define	GCR_SECRDY_IEN		bit(9)
+#define	GCR_PRIRDY_IEN		bit(8)
+#define	GCR_SECRES_IEN		bit(5)
+#define	GCR_PRIRES_IEN		bit(4)
+#define	GCR_ACLINK_OFF		bit(3)
+#define	GCR_WARM_RST		bit(2)
+#define	GCR_COLD_RST		bit(1)
+#define	GCR_GIE			bit(0)
+
+/* POSR bits - see Table 13-52 in [1] */
+
+#define	POSR_FIFOE		bit(4)
+
+/* PISR bits - see Table 13-53 in [1] */
+
+#define	PISR_FIFOE		bit(4)
+
+/* MCSR bits - see Table 13-57 in [1] */
+
+#define	MCSR_FIFOE		bit(4)
+
+/* GSR bits - see Table 13-49 in [1] */
+
+#define	GSR_CDONE		bit(19)
+#define	GSR_SDONE		bit(18)
+#define	GSR_RDCS		bit(15)
+#define	GSR_BIT3SLT12		bit(14)
+#define	GSR_BIT2SLT12		bit(13)
+#define	GSR_BIT1SLT12		bit(12)
+#define	GSR_SECRES		bit(11)
+#define	GSR_PRIRES		bit(10)
+#define	GSR_SCR			bit(9)
+#define	GSR_PCR			bit(8)
+#define	GSR_MINT		bit(7)
+#define	GSR_POINT		bit(6)
+#define	GSR_PIINT		bit(5)
+#define	GSR_MOINT		bit(2)
+#define	GSR_MIINT		bit(1)
+#define	GSR_GSCI		bit(0)
+
+/* CAR bits - see Table 13-54 in [1] */
+
+#define	CAR_CAIP		bit(0)
+
+/* PCDR bits - see Table 13-55 in [1] */
+
+#define	PCDR_PCM_RDATA_MASK	0xFFFF0000
+#define	PCDR_PCM_RDATA(x)	((x << 16) & PCDR_PCM_RDATA_MASK)
+#define	PCDR_PCM_LDATA_MASK	0x0000FFFF
+#define	PCDR_PCM_LDATA(x)	(x & PCDR_PCM_LDATA_MASK)
+
+/* MCDR bits - see Table 13-58 in [1] */
+
+#define	MCDR_MIC_IN_DAT_MASK	0x0000FFFF
+#define	MCDR_MIC_IN_DAT(x)	(x & MCDR_MIC_IN_DAT_MASK)
+
+/* MOCR bits - see Table 13-59 in [1] */
+
+#define	MOCR_FEIE		bit(3)
+
+/* MICR bits - see Table 13-60 in [1] */
+
+#define	MICR_FEIE		bit(3)
+
+/* MOSR bits - see Table 13-61 in [1] */
+
+#define	MOSR_FIFOE		bit(4)
+
+#endif /* PXA2X0_AC97_H */