From patchwork Thu Mar 14 17:46:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 2272901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id DEA363FCF6 for ; Thu, 14 Mar 2013 17:49:05 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UGCEJ-0005Ao-6a; Thu, 14 Mar 2013 17:46:15 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UGCEF-0005AV-Ro for linux-arm-kernel@lists.infradead.org; Thu, 14 Mar 2013 17:46:12 +0000 Received: from pool-72-84-113-162.nrflva.fios.verizon.net ([72.84.113.162] helo=titan) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1UGCEF-000CWr-24; Thu, 14 Mar 2013 17:46:11 +0000 Received: from triton.lakedaemon.net (triton.lakedaemon.net [10.16.5.78]) by titan (Postfix) with ESMTP id 5D0C9401F97; Thu, 14 Mar 2013 13:46:07 -0400 (EDT) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 72.84.113.162 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/uS9Zza+oSVHT/gdBNkJSjiZcYnVysjB8= From: Jason Cooper To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V3] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP Date: Thu, 14 Mar 2013 17:46:02 +0000 Message-Id: <1363283162-26041-1-git-send-email-jason@lakedaemon.net> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <20130216164457.GA23237@titan.lakedaemon.net> References: <20130216164457.GA23237@titan.lakedaemon.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130314_134611_932427_D0464057 X-CRM114-Status: GOOD ( 11.39 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.66 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: gregory.clement@free-electrons.com, andrew@lunn.ch, Jason Cooper , florian@openwrt.org, simon.guinot@sequanux.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The board is supplied with a 4GB RAM module. This value can be overridden by the bootloader based on probed memory size. We set it to a reasonable value here. Signed-off-by: Jason Cooper --- Changes from v2: - trimmed size to not conflict with internal register addresses, added comment. Thanks to Jason Gunthorpe for raising this and Gregory Clement for confirming. Changes from v1: - grammatical fix suggested by Sergei Shtylyov - correct size suggested by several folks (within 32bit, 1 dword) As promised, catching this fix in the -rc cycle. For those not familiar, earlier versions of the patch adding this board listed 3GB because that is all that was visible. I mistaken applied v3 of the patch instead of v4 which properly listed 4GB. This patch cleans up my error. arch/arm/boot/dts/armada-xp-gp.dts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts index 1c8afe2..b2d7804 100644 --- a/arch/arm/boot/dts/armada-xp-gp.dts +++ b/arch/arm/boot/dts/armada-xp-gp.dts @@ -28,12 +28,14 @@ device_type = "memory"; /* - * 4 GB of plug-in RAM modules by default but only 3GB - * are visible, the amount of memory available can be - * changed by the bootloader according the size of the - * module actually plugged + * 4 GB of plug-in RAM modules by default. The amount of memory + * available can be changed by the bootloader according to the + * size of the module actually plugged + * + * Clipped at 0xD0000000 since this is the start of the internal + * registers. */ - reg = <0x00000000 0xC0000000>; + reg = <0x00000000 0xD0000000>; }; soc {