From patchwork Tue Jun 11 14:48:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Vaussard X-Patchwork-Id: 2704611 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9A5E3C1459 for ; Tue, 11 Jun 2013 14:50:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 51FBC20350 for ; Tue, 11 Jun 2013 14:50:32 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B458B2034A for ; Tue, 11 Jun 2013 14:50:30 +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 1UmPtR-0002Dx-QU; Tue, 11 Jun 2013 14:49:54 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UmPtL-0006eq-2s; Tue, 11 Jun 2013 14:49:47 +0000 Received: from slb-mail4.epfl.ch ([2001:620:618:1e0:1:80b2:e059:1] helo=smtp4.epfl.ch) by merlin.infradead.org with smtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UmPt6-0006cV-Vt for linux-arm-kernel@lists.infradead.org; Tue, 11 Jun 2013 14:49:35 +0000 Received: (qmail 2858 invoked by uid 107); 11 Jun 2013 14:49:11 -0000 X-Virus-Scanned: ClamAV Received: from lsro1pc340.epfl.ch (HELO lsro1pc340.epfl.ch) (128.178.145.154) (authenticated) by smtp4.epfl.ch (AngelmatoPhylax SMTP proxy) with ESMTPA; Tue, 11 Jun 2013 16:49:11 +0200 From: Florian Vaussard To: Benoit Cousson Subject: [PATCH 3/3] ARM: dts: OMAP3: Use MTD constants for OMAP3 boards Date: Tue, 11 Jun 2013 16:48:58 +0200 Message-Id: <1370962138-9631-4-git-send-email-florian.vaussard@epfl.ch> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1370962138-9631-1-git-send-email-florian.vaussard@epfl.ch> References: <1370962138-9631-1-git-send-email-florian.vaussard@epfl.ch> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130611_104933_600893_0B7074A7 X-CRM114-Status: UNSURE ( 6.76 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.1 (--) Cc: Stephen Warren , Tony Lindgren , devicetree-discuss@lists.ozlabs.org, Florian Vaussard , Anil Kumar , linux-omap@vger.kernel.org, Javier Martinez Canillas , 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: , 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.4 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 Use the MTD constants for NAND and OneNAND nodes used in OMAP3 DTS. Signed-off-by: Florian Vaussard Acked-by: Javier Martinez Canillas --- arch/arm/boot/dts/omap3-devkit8000.dts | 10 +++++----- arch/arm/boot/dts/omap3-igep0020.dts | 10 +++++----- arch/arm/boot/dts/omap3-igep0030.dts | 10 +++++----- arch/arm/boot/dts/omap3430-sdp.dts | 28 ++++++++++++++-------------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts b/arch/arm/boot/dts/omap3-devkit8000.dts index 5be71b1..08699cb 100644 --- a/arch/arm/boot/dts/omap3-devkit8000.dts +++ b/arch/arm/boot/dts/omap3-devkit8000.dts @@ -143,27 +143,27 @@ x-loader@0 { label = "X-Loader"; - reg = <0 0x80000>; + reg = <(0 * SZ_128K) (4 * SZ_128K)>; }; bootloaders@80000 { label = "U-Boot"; - reg = <0x80000 0x1e0000>; + reg = <(4 * SZ_128K) (15 * SZ_128K)>; }; bootloaders_env@260000 { label = "U-Boot Env"; - reg = <0x260000 0x20000>; + reg = <(19 * SZ_128K) (1 * SZ_128K)>; }; kernel@280000 { label = "Kernel"; - reg = <0x280000 0x400000>; + reg = <(20 * SZ_128K) (32 * SZ_128K)>; }; filesystem@680000 { label = "File System"; - reg = <0x680000 0xf980000>; + reg = <(52 * SZ_128K) MTDPART_SIZ_FULL>; }; }; }; diff --git a/arch/arm/boot/dts/omap3-igep0020.dts b/arch/arm/boot/dts/omap3-igep0020.dts index e8c4828..3476b3c 100644 --- a/arch/arm/boot/dts/omap3-igep0020.dts +++ b/arch/arm/boot/dts/omap3-igep0020.dts @@ -97,23 +97,23 @@ partition@0 { label = "SPL"; - reg = <0 0x100000>; + reg = <(0 * SZ_256K) (4 * SZ_256K)>; }; partition@0x80000 { label = "U-Boot"; - reg = <0x100000 0x180000>; + reg = <(4 * SZ_256K) (6 * SZ_256K)>; }; partition@0x1c0000 { label = "Environment"; - reg = <0x280000 0x100000>; + reg = <(10 * SZ_256K) (4 * SZ_256K)>; }; partition@0x280000 { label = "Kernel"; - reg = <0x380000 0x300000>; + reg = <(14 * SZ_256K) (12 * SZ_256K)>; }; partition@0x780000 { label = "Filesystem"; - reg = <0x680000 0x1f980000>; + reg = <(26 * SZ_256K) MTDPART_SIZ_FULL>; }; }; diff --git a/arch/arm/boot/dts/omap3-igep0030.dts b/arch/arm/boot/dts/omap3-igep0030.dts index 644d053..e4f078c 100644 --- a/arch/arm/boot/dts/omap3-igep0030.dts +++ b/arch/arm/boot/dts/omap3-igep0030.dts @@ -72,23 +72,23 @@ partition@0 { label = "SPL"; - reg = <0 0x100000>; + reg = <(0 * SZ_256K) (4 * SZ_256K)>; }; partition@0x80000 { label = "U-Boot"; - reg = <0x100000 0x180000>; + reg = <(4 * SZ_256K) (6 * SZ_256K)>; }; partition@0x1c0000 { label = "Environment"; - reg = <0x280000 0x100000>; + reg = <(10 * SZ_256K) (4 * SZ_256K)>; }; partition@0x280000 { label = "Kernel"; - reg = <0x380000 0x300000>; + reg = <(14 * SZ_256K) (12 * SZ_256K)>; }; partition@0x780000 { label = "Filesystem"; - reg = <0x680000 0x1f980000>; + reg = <(26 * SZ_256K) MTDPART_SIZ_FULL>; }; }; }; diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts index 2a725a0..dd69ee0 100644 --- a/arch/arm/boot/dts/omap3430-sdp.dts +++ b/arch/arm/boot/dts/omap3430-sdp.dts @@ -81,19 +81,19 @@ partition@0 { label = "bootloader-nor"; - reg = <0 0x40000>; + reg = <(0 * SZ_128K) (2 * SZ_128K)>; }; partition@0x40000 { label = "params-nor"; - reg = <0x40000 0x40000>; + reg = <(2 * SZ_128K) (2 * SZ_128K)>; }; partition@0x80000 { label = "kernel-nor"; - reg = <0x80000 0x200000>; + reg = <(4 * SZ_128K) (16 * SZ_128K)>; }; partition@0x280000 { label = "filesystem-nor"; - reg = <0x240000 0x7d80000>; + reg = <(18 * SZ_128K) (1004 * SZ_128K)>; }; }; @@ -123,23 +123,23 @@ partition@0 { label = "xloader-nand"; - reg = <0 0x80000>; + reg = <(0 * SZ_128K) (4 * SZ_128K)>; }; partition@0x80000 { label = "bootloader-nand"; - reg = <0x80000 0x140000>; + reg = <(4 * SZ_128K) (10 * SZ_128K)>; }; partition@0x1c0000 { label = "params-nand"; - reg = <0x1c0000 0xc0000>; + reg = <(14 * SZ_128K) (6 * SZ_128K)>; }; partition@0x280000 { label = "kernel-nand"; - reg = <0x280000 0x500000>; + reg = <(20 * SZ_128K) (40 * SZ_128K)>; }; partition@0x780000 { label = "filesystem-nand"; - reg = <0x780000 0x7880000>; + reg = <(60 * SZ_128K) (964 * SZ_128K)>; }; }; @@ -168,23 +168,23 @@ partition@0 { label = "xloader-onenand"; - reg = <0 0x80000>; + reg = <(0 * SZ_128K) (4 * SZ_128K)>; }; partition@0x80000 { label = "bootloader-onenand"; - reg = <0x80000 0x40000>; + reg = <(4 * SZ_128K) (2 * SZ_128K)>; }; partition@0xc0000 { label = "params-onenand"; - reg = <0xc0000 0x20000>; + reg = <(6 * SZ_128K) (1 * SZ_128K)>; }; partition@0xe0000 { label = "kernel-onenand"; - reg = <0xe0000 0x200000>; + reg = <(7 * SZ_128K) (16 * SZ_128K)>; }; partition@0x2e0000 { label = "filesystem-onenand"; - reg = <0x2e0000 0xfd20000>; + reg = <(23 * SZ_128K) (2025 * SZ_128K)>; }; }; };