Message ID | 1370013351-7960-1-git-send-email-lee.jones@linaro.org |
---|---|
State | Accepted |
Commit | 2388af4e9b190cef9fb24e49654010fcbd0ecf97 |
Headers | show
Return-Path: <patchwork-forward+bncBDA7X7F2WUEBBNH5UKGQKGQE2EKMBGQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A1A4925DFA for <linaro@patches.linaro.org>; Fri, 31 May 2013 15:16:04 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id gf12sf191513vcb.2 for <linaro@patches.linaro.org>; Fri, 31 May 2013 08:16:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=jpy7TBYB6JSsIgFwvy9bnLWWVS7KaYxPz6KCDWmWNvo=; b=mEOOMTa0rdrW91b++WFd3IAh4ZCx37yBzuhRF3YxvkjLh9ELkd4AWl+hEeG7D6BkCB JgciU3FdtQhfI0Sk1u39eH72Cv6yb0y7lemOFM48tFvfnA498QiIZ/ApYf/QdfdCvys4 FLlQEHn+FiKWAhhW3LXj/Ai+xzJGMO/ozmRJVWAsJNGahjBYCKjxWx/jDg3Io9qYR/56 7/OJI+FRgZeKe6omOeg1gc1q0WE6UphijeCd1USWnWaa9xc7/b2kFnApc0WmTNDnJEFX E+4UCXkrXAtcnOrg4kvSZI3XI3lgTfaa2li8lOI4jQFdk3Dmy95Wfbqk5GTG+wTmz8vS np/g== X-Received: by 10.236.143.101 with SMTP id k65mr6518812yhj.45.1370013364026; Fri, 31 May 2013 08:16:04 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.52.74 with SMTP id r10ls1023046qeo.85.gmail; Fri, 31 May 2013 08:16:03 -0700 (PDT) X-Received: by 10.220.85.66 with SMTP id n2mr10754390vcl.31.1370013363859; Fri, 31 May 2013 08:16:03 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id sa4si28688832vdc.75.2013.05.31.08.16.03 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 May 2013 08:16:03 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id gf11so1146417vcb.1 for <patchwork-forward@linaro.org>; Fri, 31 May 2013 08:16:03 -0700 (PDT) X-Received: by 10.52.120.113 with SMTP id lb17mr9120535vdb.1.1370013363753; Fri, 31 May 2013 08:16:03 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.229.199 with SMTP id jj7csp54270vcb; Fri, 31 May 2013 08:16:03 -0700 (PDT) X-Received: by 10.194.237.133 with SMTP id vc5mr9881096wjc.37.1370013362653; Fri, 31 May 2013 08:16:02 -0700 (PDT) Received: from mail-wg0-x229.google.com (mail-wg0-x229.google.com [2a00:1450:400c:c00::229]) by mx.google.com with ESMTPS id rz11si4145296wjb.32.2013.05.31.08.16.02 for <patches@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 May 2013 08:16:02 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c00::229 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c00::229; Received: by mail-wg0-f41.google.com with SMTP id k13so822459wgh.0 for <patches@linaro.org>; Fri, 31 May 2013 08:16:02 -0700 (PDT) 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 <multiple recipients> (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 May 2013 08:16:01 -0700 (PDT) From: Lee Jones <lee.jones@linaro.org> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, srinidhi.kasagar@stericsson.com, Lee Jones <lee.jones@linaro.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: ALoCoQmDCCv2PzM9eoyyby4iMYAaAPl8dw4smV5ukeGjYZQySHlU6ohgpyNnyFMumpwtBae6b32z X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post?hl=en-US>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?hl=en-US&topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/?hl=en-US> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe?hl=en-US>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> |
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 {
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 <lee.jones@linaro.org> --- arch/arm/boot/dts/ccu8540.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)