diff options
author | Tom Rix <Tom.Rix@windriver.com> | 2010-01-23 07:22:23 -0600 |
---|---|---|
committer | Tom Rix <Tom.Rix@windriver.com> | 2010-01-23 07:22:23 -0600 |
commit | 790af6ed08cc3675267191eb60403bd4f0d9a03c (patch) | |
tree | ded9dced10adeea568982bf634b9dc7d3c00f537 /include/asm-arm | |
parent | 69df282a781dfe7a1bfc62acf0605992d3ea6c52 (diff) | |
parent | 57ae8a5cced612088104303777e71a3dc89c00ef (diff) | |
download | u-boot-imx-790af6ed08cc3675267191eb60403bd4f0d9a03c.zip u-boot-imx-790af6ed08cc3675267191eb60403bd4f0d9a03c.tar.gz u-boot-imx-790af6ed08cc3675267191eb60403bd4f0d9a03c.tar.bz2 |
Merge branch 'r-ml-master' into t-master
Diffstat (limited to 'include/asm-arm')
-rw-r--r-- | include/asm-arm/arch-mx31/mx31-regs.h | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/include/asm-arm/arch-mx31/mx31-regs.h b/include/asm-arm/arch-mx31/mx31-regs.h index 51b02a2..6f6e9a4 100644 --- a/include/asm-arm/arch-mx31/mx31-regs.h +++ b/include/asm-arm/arch-mx31/mx31-regs.h @@ -24,6 +24,45 @@ #ifndef __ASM_ARCH_MX31_REGS_H #define __ASM_ARCH_MX31_REGS_H +#if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) +#include <asm/types.h> + +/* Clock control module registers */ +struct clock_control_regs { + u32 ccmr; + u32 pdr0; + u32 pdr1; + u32 rcsr; + u32 mpctl; + u32 upctl; + u32 spctl; + u32 cosr; + u32 cgr0; + u32 cgr1; + u32 cgr2; + u32 wimr0; + u32 ldc; + u32 dcvr0; + u32 dcvr1; + u32 dcvr2; + u32 dcvr3; + u32 ltr0; + u32 ltr1; + u32 ltr2; + u32 ltr3; + u32 ltbr0; + u32 ltbr1; + u32 pmcr0; + u32 pmcr1; + u32 pdr2; +}; + +/* Bit definitions for RCSR register in CCM */ +#define CCM_RCSR_NF16B (1 << 31) +#define CCM_RCSR_NFMS (1 << 30) + +#endif + #define __REG(x) (*((volatile u32 *)(x))) #define __REG16(x) (*((volatile u16 *)(x))) #define __REG8(x) (*((volatile u8 *)(x))) |