From patchwork Thu Nov 6 14:28:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 40300 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5FCA824237 for ; Thu, 6 Nov 2014 14:29:26 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id gq15sf1831654lab.10 for ; Thu, 06 Nov 2014 06:29:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=kWlmyy4uy4uwQo6Cg3/fbbpSLakBV/OJlpMgcmZHl1I=; b=FK5KRJxerwOCX+vu8Rl6Hh43XdLVm315/oSb72vwpZ8/jPZX3mJeh853T3jWYM/3mm 2vVw1MwuXGA+HOMSjNydfkpd+xwWXWb0nsIX9ntCUCCOeykhtRtBTAdO/fBliOrIyPC5 Kc4tIp0gQK2QVFD1BhaPBX4gSOyZCH/JKaSXXdHG0wq2fkewPrP9dhdp0kujgWlfwQpz gGUB7bsgo8pxVtt9FRM45mlUTJNA4Cg6uMxhjiUvHXRzv0rl4uzHPw3BMnLNj70MoGwS snDnnzyPjXe22CvWQauEdtKb+qrB/SfDtAJyrtH7yD0gn1N3XR9Ur0uvszLAaV6q9hjM xgQw== X-Gm-Message-State: ALoCoQm9T6DMPY7bC7wXCdX51bVqcT75AB9sL8WtoTB0kr/F5wf2U1oRU+IfYguW3egFVH52gIUs X-Received: by 10.112.41.228 with SMTP id i4mr825461lbl.0.1415284165380; Thu, 06 Nov 2014 06:29:25 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.227 with SMTP id e3ls91037laa.69.gmail; Thu, 06 Nov 2014 06:29:25 -0800 (PST) X-Received: by 10.152.170.194 with SMTP id ao2mr5453373lac.60.1415284164991; Thu, 06 Nov 2014 06:29:24 -0800 (PST) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id v3si11603426lav.81.2014.11.06.06.29.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 06 Nov 2014 06:29:24 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by mail-lb0-f175.google.com with SMTP id n15so1001039lbi.34 for ; Thu, 06 Nov 2014 06:29:24 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr5434925lbc.34.1415284164667; Thu, 06 Nov 2014 06:29:24 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp51983lbc; Thu, 6 Nov 2014 06:29:24 -0800 (PST) X-Received: by 10.180.20.8 with SMTP id j8mr15121915wie.60.1415284164072; Thu, 06 Nov 2014 06:29:24 -0800 (PST) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id ef8si9671249wjd.84.2014.11.06.06.29.22 for ; Thu, 06 Nov 2014 06:29:24 -0800 (PST) Received-SPF: none (google.com: u-boot-bounces@lists.denx.de does not designate permitted sender hosts) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3280DA7443; Thu, 6 Nov 2014 15:29:01 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id czR6wCeHqerF; Thu, 6 Nov 2014 15:29:01 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D4CF0A745E; Thu, 6 Nov 2014 15:28:47 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9417DA7418 for ; Thu, 6 Nov 2014 15:28:31 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 16ptrJHI4i2P for ; Thu, 6 Nov 2014 15:28:31 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by theia.denx.de (Postfix) with ESMTPS id 3B5BCA7406 for ; Thu, 6 Nov 2014 15:28:26 +0100 (CET) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id sA6ESOQZ004664; Thu, 6 Nov 2014 08:28:24 -0600 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id sA6ESOYX027312; Thu, 6 Nov 2014 08:28:24 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Thu, 6 Nov 2014 08:28:24 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id sA6ESNs8016593; Thu, 6 Nov 2014 08:28:24 -0600 From: Felipe Balbi To: Tom Rini Date: Thu, 6 Nov 2014 08:28:46 -0600 Message-ID: <1415284132-6317-5-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.1.0.GIT In-Reply-To: <1415284132-6317-1-git-send-email-balbi@ti.com> References: <1415284132-6317-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 Cc: U-Boot Mailing List , Gerald Coley , "Franklin Cooper Jr." Subject: [U-Boot] [PATCH 05/11] arm: omap-common: emif: allow to map memory without interleaving X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 Reviewed-by: Tom Rini --- 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)