summaryrefslogtreecommitdiff
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2014-11-06 08:28:46 -0600
committerTom Rini <trini@ti.com>2014-12-04 11:04:13 -0500
commitdbf02eca0b5b9c4ade34064bd0d4a515bee00de5 (patch)
tree88772127cee5b7eb6eac0ef586704115fc9f1bb9 /arch/arm/cpu
parent7a294c5c0a048177d4f69b255988fdff59133ff8 (diff)
downloadu-boot-imx-dbf02eca0b5b9c4ade34064bd0d4a515bee00de5.zip
u-boot-imx-dbf02eca0b5b9c4ade34064bd0d4a515bee00de5.tar.gz
u-boot-imx-dbf02eca0b5b9c4ade34064bd0d4a515bee00de5.tar.bz2
arm: omap-common: emif: allow to map memory without interleaving
If we want to have two sections, one on each EMIF, without interleaving, current code wouldn't enable emif2. Fix that problem. Signed-off-by: Felipe Balbi <balbi@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/armv7/omap-common/emif-common.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/emif-common.c b/arch/arm/cpu/armv7/omap-common/emif-common.c
index c8e9bc8..e601ba1 100644
--- a/arch/arm/cpu/armv7/omap-common/emif-common.c
+++ b/arch/arm/cpu/armv7/omap-common/emif-common.c
@@ -1226,13 +1226,14 @@ void dmm_init(u32 base)
emif1_enabled = 1;
emif2_enabled = 1;
break;
- } else if (valid == 1) {
+ }
+
+ if (valid == 1)
emif1_enabled = 1;
- } else if (valid == 2) {
+
+ if (valid == 2)
emif2_enabled = 1;
- }
}
-
}
static void do_bug0039_workaround(u32 base)