From patchwork Mon Feb 20 03:10:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 94185 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp1243832obz; Mon, 20 Feb 2017 01:00:27 -0800 (PST) X-Received: by 10.28.74.69 with SMTP id x66mr9347414wma.124.1487581227656; Mon, 20 Feb 2017 01:00:27 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id v204si11106409wmg.3.2017.02.20.01.00.27; Mon, 20 Feb 2017 01:00:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 08D5CB3E81; Mon, 20 Feb 2017 09:37:21 +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 J1te1r1I2RgA; Mon, 20 Feb 2017 09:37:20 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DDD653AEA; Mon, 20 Feb 2017 09:23:59 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 20D844A08A for ; Mon, 20 Feb 2017 04:10:35 +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 6GCAQxuoFlKX for ; Mon, 20 Feb 2017 04:10:35 +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 conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by theia.denx.de (Postfix) with ESMTPS id 6E5E24A068 for ; Mon, 20 Feb 2017 04:10:30 +0100 (CET) Received: from pug.jp.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id v1K3AM6p002946; Mon, 20 Feb 2017 12:10:22 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v1K3AM6p002946 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1487560222; bh=ShnrCS460M/W88EasFb2DBXbZTmepVNuZxFa1KF/IyA=; h=From:To:Cc:Subject:Date:From; b=m/Hsq12yU+Mi9HsAQlkIALZfnm7u8bJ1OZ64nwvkdQuf1k6N7Wx3roSnkUxs3U7NU QmJcwlVkU/on0AZQQ1fM21vuGzy3M0Zh6SAPrw08MI6Ng+QHrJdeMHDAFQK2Au1b78 nozg13RvhUf8QOBwy1ZdpPAYviZrVwfqw/Hhv0UFyT844+9J3CcCYj1xNOVC7dSkFD LwFnHi1wZ9gb1m6FTh7VEKf3+j40kHgRIXUpPN4p7W5TAWtESjPpNk2k6MSuXhJzVv JoA0tmvtWv4epq1/KPtupNwni0WKJb8ofG9LiantN7Eo5/3OlruYTJEwaz410QOGGn bEGeTPUbv4sWg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 20 Feb 2017 12:10:05 +0900 Message-Id: <1487560205-19522-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Cc: Albert Aribaud Subject: [U-Boot] [PATCH] ARM: uniphier: skip MEMCONF ch2 parsing if CH2_DISABLE bit is set X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" If SG_MEMCONF_CH2_DISABLE bit is set, the DRAM channel 2 is unused. The register settings for the ch2 should be ignored. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/dram_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c index 1cd354e..d98187d 100644 --- a/arch/arm/mach-uniphier/dram_init.c +++ b/arch/arm/mach-uniphier/dram_init.c @@ -166,7 +166,7 @@ static int uniphier_memconf_decode(struct uniphier_dram_map *dram_map) dram_map[1].size = size; - if (!data->have_ch2) + if (!data->have_ch2 || val & SG_MEMCONF_CH2_DISABLE) return 0; /* set up ch2 */