diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-12-08 09:41:29 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-12-08 09:41:29 -0500 |
| commit | 1265edb8fd2869d17128f1d60683dd6f4191d550 (patch) | |
| tree | 795e037b9dcaf8fced9777673032f01fe5271667 /include/asm-arm | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
| parent | 03d14a5536cf5611d27a106137a814c8f1135ddd (diff) | |
Merge branch 'pxa-fixes'
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/arch-pxa/pxa-regs.h | 1 |
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 @@ | |||
| 1784 | #define CCCR_M_MASK 0x0060 /* Memory Frequency to Run Mode Frequency Multiplier */ | 1784 | #define CCCR_M_MASK 0x0060 /* Memory Frequency to Run Mode Frequency Multiplier */ |
| 1785 | #define CCCR_L_MASK 0x001f /* Crystal Frequency to Memory Frequency Multiplier */ | 1785 | #define CCCR_L_MASK 0x001f /* Crystal Frequency to Memory Frequency Multiplier */ |
| 1786 | 1786 | ||
| 1787 | #define CKEN_AC97CONF (31) /* AC97 Controller Configuration */ | ||
| 1787 | #define CKEN_CAMERA (24) /* Camera Interface Clock Enable */ | 1788 | #define CKEN_CAMERA (24) /* Camera Interface Clock Enable */ |
| 1788 | #define CKEN_SSP1 (23) /* SSP1 Unit Clock Enable */ | 1789 | #define CKEN_SSP1 (23) /* SSP1 Unit Clock Enable */ |
| 1789 | #define CKEN_MEMC (22) /* Memory Controller Clock Enable */ | 1790 | #define CKEN_MEMC (22) /* Memory Controller Clock Enable */ |