From patchwork Tue Oct 18 08:21:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9381583 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4636D60487 for ; Tue, 18 Oct 2016 08:23:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35E18285DA for ; Tue, 18 Oct 2016 08:23:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A31028F7C; Tue, 18 Oct 2016 08:23:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 99509285DA for ; Tue, 18 Oct 2016 08:23:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bwPef-0006Vt-BP; Tue, 18 Oct 2016 08:21:49 +0000 Received: from mail-lf0-x22b.google.com ([2a00:1450:4010:c07::22b]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bwPeY-0006T9-G4 for linux-arm-kernel@lists.infradead.org; Tue, 18 Oct 2016 08:21:44 +0000 Received: by mail-lf0-x22b.google.com with SMTP id l131so14885583lfl.2 for ; Tue, 18 Oct 2016 01:21:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=qp5X0nZ87p5v13Pvz6wDgb1LLM36X4sh1dJ9JOK3Ais=; b=Qk5OemPrdFX1Otu9y8pZEnn2vSqxteRpPwze6J3V1PVuzfT64LOIHUacP8RmxeXT0U /XP6wKi6hxPhOLY30BnSO2Nm+he8DkGc4w9gNBVy0eGU4GhbfUVBi3I/C3edZ+C+HHn9 kyKTEjNtFUEN8Hlt/QIPwaZF19E9V1E4gmFTA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qp5X0nZ87p5v13Pvz6wDgb1LLM36X4sh1dJ9JOK3Ais=; b=VtLkHzsE9eOqCHUKauqyVOlhNOqaou/tLUt/dSFTSlLL22CjaFsxOmYF2ASLFpmK0U vJNFipdjmBJe58xJvvvkCxQI5WfdMv8BfeLdj7T7UDRJ8J0pDhyHAl5/2ZukQIvTfT+w auVtExoEQNEFxLzYe2qkVAWQ1Wvs6W8L49Cabo+mE12x0wwrODAiuo4yV26DdcvboD2b jSOj4lH/QKmIlqw1IryAaFP97Kr6MTQFZ6Tkz2zb6dZ50U2l/ZmYf4qM7+AKGyjY0oFF zBXI8X2R3fPDWldH83lmAixx7lsYkNR80eyFR0prcxNzyetaway2R4MOCBgQf5AKDdDx s9+Q== X-Gm-Message-State: AA6/9RljnxA6oxRNqKOv2ofgbYhvRDBEc7xC/edyLSv+7RbI2tuyOuqPj/DJESL4v3h4Qpcr X-Received: by 10.25.162.202 with SMTP id l193mr18939181lfe.173.1476778876979; Tue, 18 Oct 2016 01:21:16 -0700 (PDT) Received: from linuslaptop.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id h36sm8904809ljh.41.2016.10.18.01.21.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Oct 2016 01:21:16 -0700 (PDT) From: Linus Walleij To: arm@kernel.org Subject: [PATCH] ARM: dts: realview: Extend PBX family memory description Date: Tue, 18 Oct 2016 10:21:13 +0200 Message-Id: <1476778873-12210-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161018_012143_020984_BB157AD1 X-CRM114-Status: GOOD ( 17.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , Robin Murphy , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Robin Murphy All three platforms sharing the later RealView Platform Baseboard memory map - PBX-A9, PB-A8 and PB11MPCore, provide 512MB of DDR SDRAM on the baseboard, of which the boot alias at 0x0 maps the first 256MB. Expand the size of the default memory node to reflect that, and describe the full memory regions in each board's DTS, but leave those commented by default to avoid breaking existing bootloaders. Signed-off-by: Robin Murphy Signed-off-by: Linus Walleij --- ARM SoC folks: I forgot to send this patch for ARM SoC earlier. As it is a small change I suggest you just apply it to the ARM SoC tree as I do not foresee any other RealView work in the near future. If you think it can go into v4.9 then put it in as a fix, else just push it to the next merge window. Robin: sorry for screwing up :( --- arch/arm/boot/dts/arm-realview-pba8.dts | 8 ++++++++ arch/arm/boot/dts/arm-realview-pbx-a9.dts | 9 +++++++++ arch/arm/boot/dts/arm-realview-pbx.dtsi | 4 ++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/arm-realview-pba8.dts b/arch/arm/boot/dts/arm-realview-pba8.dts index d3238c252b59..9f6c92b84f9f 100644 --- a/arch/arm/boot/dts/arm-realview-pba8.dts +++ b/arch/arm/boot/dts/arm-realview-pba8.dts @@ -40,6 +40,14 @@ }; }; + /* + * Using the full 512MB of RAM will require bootloader + * changes to not load the kernel to the alias at 0x0. + */ + memory { + /*reg = <0x70000000 0x20000000>; /* 512 MiB baseboard DDR */ + }; + pmu: pmu@0 { compatible = "arm,cortex-a8-pmu"; interrupt-parent = <&intc>; diff --git a/arch/arm/boot/dts/arm-realview-pbx-a9.dts b/arch/arm/boot/dts/arm-realview-pbx-a9.dts index 90d00b407f85..9fef9188660a 100644 --- a/arch/arm/boot/dts/arm-realview-pbx-a9.dts +++ b/arch/arm/boot/dts/arm-realview-pbx-a9.dts @@ -60,6 +60,15 @@ }; }; + /* + * There is 1GB of RAM total, but using all of it will require + * bootloader changes to not load the kernel to the alias at 0x0. + */ + memory { + /*reg = <0x20000000 0x20000000>, /* 512 MiB daughterboard DDR2 */ + /* <0x70000000 0x20000000>; /* 512 MiB baseboard DDR */ + }; + L2: l2-cache { compatible = "arm,pl310-cache"; reg = <0x1f002000 0x1000>; diff --git a/arch/arm/boot/dts/arm-realview-pbx.dtsi b/arch/arm/boot/dts/arm-realview-pbx.dtsi index aeb49c4bd773..8477f667d27c 100644 --- a/arch/arm/boot/dts/arm-realview-pbx.dtsi +++ b/arch/arm/boot/dts/arm-realview-pbx.dtsi @@ -38,8 +38,8 @@ }; memory { - /* 128 MiB memory @ 0x0 */ - reg = <0x00000000 0x08000000>; + /* 256 MiB alias of baseboard DDR @ 0x0 */ + reg = <0x00000000 0x10000000>; }; /* The voltage to the MMC card is hardwired at 3.3V */