diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-12-01 12:10:51 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-12-01 12:10:51 +0100 |
| commit | 57bf140ac66f95c9c36c494e4d027551b5477b01 (patch) | |
| tree | 78cc2602ee9dca3284e47f38d29380171fb53646 /cpu/arm_cortexa8/omap3 | |
| parent | 34ddbd171ba154e9afd83f07a07ad8b57ac592e3 (diff) | |
| parent | 71636fa7c3de63de29c0f514d5c725eccb011657 (diff) | |
| download | olio-uboot-2014.01-57bf140ac66f95c9c36c494e4d027551b5477b01.tar.xz olio-uboot-2014.01-57bf140ac66f95c9c36c494e4d027551b5477b01.zip | |
Merge branch 'next-sync' of git://git.denx.de/u-boot-arm into next
Diffstat (limited to 'cpu/arm_cortexa8/omap3')
| -rw-r--r-- | cpu/arm_cortexa8/omap3/mem.c | 5 | ||||
| -rw-r--r-- | cpu/arm_cortexa8/omap3/sys_info.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cpu/arm_cortexa8/omap3/mem.c b/cpu/arm_cortexa8/omap3/mem.c index 8b8cd6d61..dfb7e4c2a 100644 --- a/cpu/arm_cortexa8/omap3/mem.c +++ b/cpu/arm_cortexa8/omap3/mem.c @@ -161,10 +161,11 @@ void do_sdrc_init(u32 cs, u32 early) writel(0, &sdrc_base->sysconfig); /* setup sdrc to ball mux */ - writel(SDP_SDRC_SHARING, &sdrc_base->sharing); + writel(SDRC_SHARING, &sdrc_base->sharing); /* Disable Power Down of CKE cuz of 1 CKE on combo part */ - writel(SRFRONRESET | PAGEPOLICY_HIGH, &sdrc_base->power); + writel(WAKEUPPROC | PWDNEN | SRFRONRESET | PAGEPOLICY_HIGH, + &sdrc_base->power); writel(ENADLL | DLLPHASE_90, &sdrc_base->dlla_ctrl); sdelay(0x20000); diff --git a/cpu/arm_cortexa8/omap3/sys_info.c b/cpu/arm_cortexa8/omap3/sys_info.c index 31b20033c..08fb32eaa 100644 --- a/cpu/arm_cortexa8/omap3/sys_info.c +++ b/cpu/arm_cortexa8/omap3/sys_info.c @@ -109,7 +109,7 @@ u32 get_cpu_rev(void) ****************************************************/ u32 is_mem_sdr(void) { - if (readl(&sdrc_base->cs[CS0].mr) == SDP_SDRC_MR_0_SDR) + if (readl(&sdrc_base->cs[CS0].mr) == SDRC_MR_0_SDR) return 1; return 0; } |