aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-12-08 14:41:29 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-12-08 14:41:29 +0000
commit1265edb8fd2869d17128f1d60683dd6f4191d550 (patch)
tree795e037b9dcaf8fced9777673032f01fe5271667 /include/asm-arm
parentMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff)
parent[ARM] 4690/1: PXA: fix CKEN corruption in PXA27x AC97 cold reset code (diff)
downloadlinux-dev-1265edb8fd2869d17128f1d60683dd6f4191d550.tar.xz
linux-dev-1265edb8fd2869d17128f1d60683dd6f4191d550.zip
Merge branch 'pxa-fixes'
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/arch-pxa/pxa-regs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/include/asm-arm/arch-pxa/pxa-regs.h
index 6b33df6f1995..1bd398da07da 100644
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
@@ -1784,6 +1784,7 @@
#define CCCR_M_MASK 0x0060 /* Memory Frequency to Run Mode Frequency Multiplier */
#define CCCR_L_MASK 0x001f /* Crystal Frequency to Memory Frequency Multiplier */
+#define CKEN_AC97CONF (31) /* AC97 Controller Configuration */
#define CKEN_CAMERA (24) /* Camera Interface Clock Enable */
#define CKEN_SSP1 (23) /* SSP1 Unit Clock Enable */
#define CKEN_MEMC (22) /* Memory Controller Clock Enable */