From patchwork Fri May 31 14:24:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 2644181 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 5F0C63FD4E for ; Fri, 31 May 2013 14:25:12 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiQGU-0003OA-84; Fri, 31 May 2013 14:25:10 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiQGR-0003C4-Fh; Fri, 31 May 2013 14:25:07 +0000 Received: from mail-we0-x22e.google.com ([2a00:1450:400c:c03::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiQGP-0003BF-8z for linux-arm-kernel@lists.infradead.org; Fri, 31 May 2013 14:25:05 +0000 Received: by mail-we0-f174.google.com with SMTP id x50so1287957wes.5 for ; Fri, 31 May 2013 07:24:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=1fAScw5Cn0IrRjXPmHn4sWfJVvmARXe2g8m0u0OafIY=; b=RULCBxJEOKrQtyKI7sEh+78TxuoSz6U9cejc1NNGclwEMWK4R+j/L9T+Xs375KpcoH wL/ZJBRQ5EKJKpkB6Ge3nDH7l45Dk6CzdsderO+6pwh3jTdfd+EWvWmb2ftwNmXAl35m IeuHRbCsr4+uF7zIVe6MsxqUOA1N+76rKio4r3+afm+6+JirhqDVxfzFhn+f6QQ2LaD+ loCgQyKYVJ/Bl2KJo+PLnWlyhhrNvNo0jWBZ+2x1lJLb/OlMG5FgBbjJta1YQXB9Do0/ BO+3Q33oxvJ+ejlfxyP6sdvIgDGlDPQuqhcCoHH9D/glRkUy78RkKXggmVFi1p2xHPfX 36bw== X-Received: by 10.180.74.207 with SMTP id w15mr3547129wiv.19.1370010280119; Fri, 31 May 2013 07:24:40 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPSA id fx7sm4261208wic.11.2013.05.31.07.24.38 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 May 2013 07:24:39 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] ARM: ux500: Allocate correct amount of memory for the u8540 in DT Date: Fri, 31 May 2013 15:24:31 +0100 Message-Id: <1370010272-25520-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQlgE3N4JhKgemfNpiCMQlMU4N0MhYidKE5XfsXPLVFW8mgqeeTYg+9iU3C9Alq5J233R5fL X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130531_102505_451965_3BE375A3 X-CRM114-Status: GOOD ( 11.98 ) 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 ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de, srinidhi.kasagar@stericsson.com 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 As it stands, the memory node in the u8540 Device Tree is ignored and memory is actually stipulated by the bootloader via ATAGS. ARM core architecture code then extracts the memory ATAG and inserts it into the Device Tree. In the u8540 the LittleKernel bootloader only stipulates 512MB of memory; however, the u8540 actually has 4GB. We're taking the responsibility to register the remainder from Device Tree here. Signed-off-by: Lee Jones --- arch/arm/boot/dts/ccu8540.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/ccu8540.dts b/arch/arm/boot/dts/ccu8540.dts index 12f0bc2..199866b 100644 --- a/arch/arm/boot/dts/ccu8540.dts +++ b/arch/arm/boot/dts/ccu8540.dts @@ -16,8 +16,8 @@ model = "ST-Ericsson U8540 platform with Device Tree"; compatible = "st-ericsson,ccu8540", "st-ericsson,u8540"; - memory { - reg = <0x00000000 0x20000000>; + memory@0 { + reg = <0x20000000 0x3f000000>, <0xc0000000 0x3f000000>; }; soc {