From patchwork Thu Oct 15 20:48:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 7409821 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EB6309F302 for ; Thu, 15 Oct 2015 20:53:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 17C692078B for ; Thu, 15 Oct 2015 20:53:19 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 2F77F20691 for ; Thu, 15 Oct 2015 20:53:18 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZmpVC-0003li-Gd; Thu, 15 Oct 2015 20:51:54 +0000 Received: from mout.kundenserver.de ([212.227.17.13]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZmpVA-0003dd-Eg; Thu, 15 Oct 2015 20:51:53 +0000 Received: from localhost.localdomain ([95.91.39.67]) by mrelayeu.kundenserver.de (mreue104) with ESMTPSA (Nemesis) id 0Lzrl5-1aaH862gUN-0153zX; Thu, 15 Oct 2015 22:51:21 +0200 From: Stefan Wahren To: Stephen Warren , Lee Jones , Eric Anholt Subject: [PATCH RFT] ARM: bcm2835: dt: fix memory of Raspberry Pi B+ Date: Thu, 15 Oct 2015 22:48:44 +0200 Message-Id: <1444942124-23122-1-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 1.7.10.4 X-Provags-ID: V03:K0:F6a/quG1zwsK+sFPFCFAUewTSHKyH/yuX3q/pv6ndse2KyJhqSJ SLie8VuYVtNxjwZnhYAWTol9TPVa96ntFr1o/Z/FECldFwUt/gp/N0L/fMGGjEkWvW1Djti RUVZMxg971nzQjUjGy+f44UVgf/76qJC+7O+EUIRjusAh+TuZlpIV1K28rPnDIrwPhP58C7 rMvxXn754aHhq9rroGHAA== X-UI-Out-Filterresults: notjunk:1; V01:K0:ayF/CgUkHG0=:j8URbZvk1SbSfN5wFHZfip x26NVoQik9EsRZlTvbFQBHkPKFUSUi/94/P4p9Lsjtg9DEyuGCHncJbgJ7iO4IkG7C3RMf3zV mtx9pv+ycmYTG30xGehS4TXYzzj6Y2ig4EnG1u/VI2C9PU/mESPpwr4HyB4iIuQ4SbiwfKIUQ e4v3lZkVeR48WS6+xRb5539w2tp9UFi6LOKEb0UqnTOgqBxZTtrPgAYXxHWIyYPg8PkZIOxRV 1BuJtXZQu9ky1z63BEzVlgrwgEGn1Q5ez+W1oSuOYrfmMoEOpbnWpBgICs7+sdB8M4JGVPhOl erh+9saEDa75M6Rko9jGOJl6zAaRb3Z78E+K7WJQI3HlVtQoswu2g4I+7UQkq6i9dOkbzyX/H l8/FR5teUQ3Ju/C53FZh1P2jb2u1vb5vbDYI5Oro5HUISl3gq2iAxtjxeP2OJuNANLUCiboBg Ws47xRQ1MK4iPRlRPVXUXnLQZsh6JbMfQnOpNiZb9jizC15T9GlUdzL4FonhER6/pcVyP5yw6 fHRyj/6iyPhA+FO3Z/XySDRIhqiJMF6R6AqYre2CvH9+ya4JwhsJRw630kjPDk+xBs7xmLFdL SW55XfnmNk9NfICU4v4TqDqrBDfx8GgGkspHanJzGMyIVlta+RdYwuiG3hAKVZrDe60XtZUl0 dCDoSj70iIq0OsM8W/GHNZuiCMUStHXzEeGim5NHhxJTD0w4fI6LwD7IYd/6QPKz/JxY= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151015_135152_660419_E1920330 X-CRM114-Status: UNSURE ( 9.10 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) 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: devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, 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-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 Since the Raspberry Pi models differ in memory amount we better define it at board level. After that we are able to fix the memory node of the Raspberry Pi B+ . Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 ++++ arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 ++++ arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 4 ++++ arch/arm/boot/dts/bcm2835-rpi-b.dts | 4 ++++ arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 ---- 5 files changed, 16 insertions(+), 4 deletions(-) This patch is only compile-tested. diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts index b2bff43..c08dff2 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -5,6 +5,10 @@ compatible = "raspberrypi,model-a-plus", "brcm,bcm2835"; model = "Raspberry Pi Model A+"; + memory { + reg = <0 0x10000000>; /* 256 MB */ + }; + leds { act { gpios = <&gpio 47 0>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts index 668442b..b4a1e56 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -5,6 +5,10 @@ compatible = "raspberrypi,model-b-plus", "brcm,bcm2835"; model = "Raspberry Pi Model B+"; + memory { + reg = <0 0x20000000>; /* 512 MB */ + }; + leds { act { gpios = <&gpio 47 0>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts index eab8b591..e6ccfab 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -5,6 +5,10 @@ compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835"; model = "Raspberry Pi Model B rev2"; + memory { + reg = <0 0x10000000>; /* 256 MB */ + }; + leds { act { gpios = <&gpio 16 1>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts index ff6b2d1..bfd917c 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -5,6 +5,10 @@ compatible = "raspberrypi,model-b", "brcm,bcm2835"; model = "Raspberry Pi Model B"; + memory { + reg = <0 0x10000000>; /* 256 MB */ + }; + leds { act { gpios = <&gpio 16 1>; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index 3572f03..d1c6538 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -1,10 +1,6 @@ #include "bcm2835.dtsi" / { - memory { - reg = <0 0x10000000>; - }; - leds { compatible = "gpio-leds";