aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/omap-common/mem-common.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-07-02 16:38:02 -0400
committerTom Rini <trini@ti.com>2014-07-02 16:38:02 -0400
commitfe8b3212b7938861eacdefe6115810303a96f9cc (patch)
tree281508c9caa5a969597a4dff58d3027337b8759c /arch/arm/cpu/armv7/omap-common/mem-common.c
parenta176ff0705351bf6d993a8f15e081bfa2ba2e1af (diff)
parent304f936aeaab0c3cc9d5af438fd3498ac7682991 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common/mem-common.c')
-rw-r--r--arch/arm/cpu/armv7/omap-common/mem-common.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/mem-common.c b/arch/arm/cpu/armv7/omap-common/mem-common.c
index 944ef840a1..5bc7e1f19b 100644
--- a/arch/arm/cpu/armv7/omap-common/mem-common.c
+++ b/arch/arm/cpu/armv7/omap-common/mem-common.c
@@ -121,7 +121,8 @@ void gpmc_init(void)
writel(0x00000008, &gpmc_cfg->sysconfig);
writel(0x00000000, &gpmc_cfg->irqstatus);
writel(0x00000000, &gpmc_cfg->irqenable);
- writel(0x00000000, &gpmc_cfg->timeout_control);
+ /* disable timeout, set a safe reset value */
+ writel(0x00001ff0, &gpmc_cfg->timeout_control);
#ifdef CONFIG_NOR
writel(0x00000200, &gpmc_cfg->config);
#else
@@ -133,5 +134,6 @@ void gpmc_init(void)
writel(0, &gpmc_cfg->cs[0].config7);
sdelay(1000);
/* enable chip-select specific configurations */
- enable_gpmc_cs_config(gpmc_regs, &gpmc_cfg->cs[0], base, size);
+ if (base != 0)
+ enable_gpmc_cs_config(gpmc_regs, &gpmc_cfg->cs[0], base, size);
}