From patchwork Fri Jan 24 14:14:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 3534931 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9F6ED9F1C3 for ; Fri, 24 Jan 2014 14:15:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 09EA520131 for ; Fri, 24 Jan 2014 14:15:14 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C969A20123 for ; Fri, 24 Jan 2014 14:15:08 +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 1W6hWz-0004hg-Lx; Fri, 24 Jan 2014 14:14:49 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6hWt-0000XF-VW; Fri, 24 Jan 2014 14:14:43 +0000 Received: from smtp.citrix.com ([66.165.176.89]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6hWq-0000WK-EH for linux-arm-kernel@lists.infradead.org; Fri, 24 Jan 2014 14:14:41 +0000 X-IronPort-AV: E=Sophos;i="4.95,712,1384300800"; d="scan'208";a="96172243" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 24 Jan 2014 14:14:14 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Fri, 24 Jan 2014 09:14:13 -0500 Received: from drall.uk.xensource.com ([10.80.16.71] helo=drall.uk.xensource.com.) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1W6hWO-0006VX-I0; Fri, 24 Jan 2014 14:14:12 +0000 From: Ian Campbell To: Subject: [PATCH] sunxi: dts: add a note that memory size is adjusted by boot loader. Date: Fri, 24 Jan 2014 14:14:12 +0000 Message-ID: <1390572852-15027-1-git-send-email-ijc@hellion.org.uk> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-DLP: MIA1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140124_091440_635558_681DA158 X-CRM114-Status: GOOD ( 10.49 ) X-Spam-Score: -6.9 (------) Cc: Hans de Goede , Maxime Ripard , linux-sunxi@googlegroups.com, linux-arm-kernel@lists.infradead.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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I had to spend a couple of minutes proving to myself that this was the case on cubietruck, so add a comment to save the next guy some effort. Signed-off-by: Ian Campbell Cc: Maxime Ripard Cc: Hans de Goede Cc: linux-arm-kernel@lists.infradead.org Cc: linux-sunxi@googlegroups.com --- This patch applies cleanly against v3.13 and Hans' sunxi-devel branch. A plausible alternative would be to pull the memory node out of the dtsi files and into the board specific files. I didn't go straight to that since I'd have to research all the various boards ;-) I considered maing it "reg = <0 0>" but decided that having some sort of least common denominator would let things work even if the bootloader were broken. --- arch/arm/boot/dts/sun4i-a10.dtsi | 1 + arch/arm/boot/dts/sun5i-a10s.dtsi | 1 + arch/arm/boot/dts/sun5i-a13.dtsi | 1 + arch/arm/boot/dts/sun6i-a31.dtsi | 1 + arch/arm/boot/dts/sun7i-a20.dtsi | 1 + 5 files changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 3e60883..9ba0beb 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -30,6 +30,7 @@ }; memory { + /* 1GB by default, will be updated by U-Boot */ reg = <0x40000000 0x80000000>; }; diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index 0376c50..d12ed7e 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi @@ -27,6 +27,7 @@ }; memory { + /* 512MB by default, will be updated by U-Boot */ reg = <0x40000000 0x20000000>; }; diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index b81aeb9..6f8bfd9 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -27,6 +27,7 @@ }; memory { + /* 512MB by default, will be updated by U-Boot */ reg = <0x40000000 0x20000000>; }; diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index 3f6f07b..bcbef9a 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -46,6 +46,7 @@ }; memory { + /* 2GB by default, will be updated by U-Boot */ reg = <0x40000000 0x80000000>; }; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 907cfcc..658e74b 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -38,6 +38,7 @@ }; memory { + /* 1GB by default, will be updated by U-Boot */ reg = <0x40000000 0x80000000>; };