[U-Boot] [PATCH 05/11] arm: omap-common: emif: allow to map memory without interleaving

[Felipe Balbi]

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 at ti.com>
---
 arch/arm/cpu/armv7/omap-common/emif-common.c | 9 +++++----
 1 file 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)
-- 
2.1.0.GIT