From patchwork Fri May 31 15:15:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 2644551 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 204373FD4E for ; Fri, 31 May 2013 15:17:09 +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 1UiR4Q-000631-1x; Fri, 31 May 2013 15:16:46 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiR47-0004Xf-24; Fri, 31 May 2013 15:16:27 +0000 Received: from mail-we0-x232.google.com ([2a00:1450:400c:c03::232]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiR43-0004W5-VL for linux-arm-kernel@lists.infradead.org; Fri, 31 May 2013 15:16:24 +0000 Received: by mail-we0-f178.google.com with SMTP id q56so1343847wes.23 for ; Fri, 31 May 2013 08:16:02 -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=jpy7TBYB6JSsIgFwvy9bnLWWVS7KaYxPz6KCDWmWNvo=; b=FfJaGxOPBzqKsXWMVZmYETBSBL5blwHzKThZjWdCqM5hKPsFRNil/7pDw/7+8XvCLS f6RsEpxRzQ8j2GbBniGwBZ1IqVVXZVjVBeZ/2+4wXDFLu1v6eUud4PGoBN5jMUMfwqiF TyYvWlisisPwFnxgGnBexFzC+z9hea5omJAwLxGL05inf6NplqWAWodU4C0852YCDcO8 j2TtVLwHVVdY77BtfCQvUrMPSh2qikCFMZqV2zFTfineqgbN84eR9tIDsm4rd7pxrT4k YrwlDPCF/i1LkHkai45sIjrrCfHrbnSYBxCQdgc3kdTQZvbZVJP6zmr5QaT8LNSaBxtx G5IA== X-Received: by 10.194.171.65 with SMTP id as1mr9869255wjc.40.1370013362034; Fri, 31 May 2013 08:16:02 -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 fv11sm4569509wic.11.2013.05.31.08.16.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 May 2013 08:16:01 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] ARM: ux500: Allocate correct amount of memory for the u8540 in DT Date: Fri, 31 May 2013 16:15:51 +0100 Message-Id: <1370013351-7960-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQmFOoEIeaPPzPIUTqFRhGsruWW7x5z8ZlXuCDPzzUIDqfMl+OE6wRvaZUbcB2krBhQHy0tB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130531_111624_137475_6789AA2A 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 2GB. 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..5603764 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 0x1f000000>, <0xc0000000 0x3f000000>; }; soc {