diff options
author | Wolfgang Denk <wd@denx.de> | 2010-06-18 01:20:49 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-06-18 01:20:49 +0200 |
commit | 54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8 (patch) | |
tree | 9e796e38d4edeabec4d091ed89d6fe179e84956c /arch/arm/include/asm/arch-omap3/cpu.h | |
parent | 86caca1cd97ba71b7a7c82f2b0163682df35ce5d (diff) | |
parent | 1f241263e088a71b8f33f87b03a37c5418d41e2e (diff) | |
download | u-boot-imx-54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8.zip u-boot-imx-54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8.tar.gz u-boot-imx-54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8.tar.bz2 |
Merge branch 'master' into next
Conflicts:
Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/arm/include/asm/arch-omap3/cpu.h')
-rw-r--r-- | arch/arm/include/asm/arch-omap3/cpu.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-omap3/cpu.h b/arch/arm/include/asm/arch-omap3/cpu.h index aa8de32..c072c27 100644 --- a/arch/arm/include/asm/arch-omap3/cpu.h +++ b/arch/arm/include/asm/arch-omap3/cpu.h @@ -215,6 +215,31 @@ struct sdrc { u8 res4[0xC]; struct sdrc_cs cs[2]; /* 0x80 || 0xB0 */ }; + +/* EMIF4 */ +typedef struct emif4 { + unsigned int sdram_sts; + unsigned int sdram_config; + unsigned int res1; + unsigned int sdram_refresh_ctrl; + unsigned int sdram_refresh_ctrl_shdw; + unsigned int sdram_time1; + unsigned int sdram_time1_shdw; + unsigned int sdram_time2; + unsigned int sdram_time2_shdw; + unsigned int sdram_time3; + unsigned int sdram_time3_shdw; + unsigned char res2[8]; + unsigned int sdram_pwr_mgmt; + unsigned int sdram_pwr_mgmt_shdw; + unsigned char res3[32]; + unsigned int sdram_iodft_tlgc; + unsigned char res4[128]; + unsigned int ddr_phyctrl1; + unsigned int ddr_phyctrl1_shdw; + unsigned int ddr_phyctrl2; +} emif4_t; + #endif /* __ASSEMBLY__ */ #endif /* __KERNEL_STRICT_NAMES */ |