From: Felipe Balbi <balbi@ti.com>
Date: Thu, 6 Nov 2014 14:28:46 +0000 (-0600)
Subject: arm: omap-common: emif: allow to map memory without interleaving
X-Git-Tag: v2025.01-rc5-pxa1908~14176^2~17
X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-favicon.png?a=commitdiff_plain;h=dbf02eca0b5b9c4ade34064bd0d4a515bee00de5;p=u-boot.git

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>
---

diff --git a/arch/arm/cpu/armv7/omap-common/emif-common.c b/arch/arm/cpu/armv7/omap-common/emif-common.c
index c8e9bc86e5..e601ba1886 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)