From patchwork Sat Nov 28 11:14:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 7716881 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BA3E5BEEE1 for ; Sat, 28 Nov 2015 11:17:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6BDBC205F4 for ; Sat, 28 Nov 2015 11:17:16 +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 988FD205F5 for ; Sat, 28 Nov 2015 11:17:15 +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 1a2dTb-0005e9-Cu; Sat, 28 Nov 2015 11:15:35 +0000 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a2dSi-00044q-Rh for linux-arm-kernel@lists.infradead.org; Sat, 28 Nov 2015 11:14:44 +0000 Received: by wmww144 with SMTP id w144so83550817wmw.0 for ; Sat, 28 Nov 2015 03:14:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v5Gy/NP8ej51P1I5nqK4WylOlIieL7zCi+6kf7LOR+c=; b=A451LTubmOrHCzULjFOj6kp3In/EzqOlLC0ghRVxmXKGRdJPsJwfz5xuSCuY4ozhG7 TSd+WCSQoA9P8ohv7qMnN+wrG77OukjwpE1tZNEKwp2beWA5bWhxwPJTeZZ6a7yjpWDf DG2B0c4YBJbU4XIixUxwgVN3JMLdbJ01g1bgm5RaKVRX8Hv/n/bJxbF9vNWyAOi/i18h 0rahSYBIeXhRtPmhqIObgBXMvPrJ99qGBEzASv0EQtQN7znJ1+zVYuJaOei0cbMnffNU 4+V3qJqGBLwOpvP+VdQdB8BOg81xLpEvnHikXjQ/lM0/9gq/PZmN/VUb6uX6w/5n7uaa fNfg== X-Received: by 10.28.48.10 with SMTP id w10mr15415827wmw.39.1448709259204; Sat, 28 Nov 2015 03:14:19 -0800 (PST) Received: from topkick.lan (x55b0ef74.dyn.telefonica.de. [85.176.239.116]) by smtp.gmail.com with ESMTPSA id f11sm11821956wmd.7.2015.11.28.03.14.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Nov 2015 03:14:18 -0800 (PST) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH 2/4] ARM: dt: mvebu: ix4-300d: move partitions to partition sub-node Date: Sat, 28 Nov 2015 12:14:06 +0100 Message-Id: <1448709248-21177-3-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1448709248-21177-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1448709248-21177-1-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151128_031441_156655_4BD0621A X-CRM114-Status: GOOD ( 10.97 ) X-Spam-Score: -2.7 (--) 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: Mark Rutland , Andrew Lunn , Russell King , Jason Cooper , Pawel Moll , Ian Campbell , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring , Kumar Gala , Gregory Clement , Benoit Masson , 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.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, 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 NAND flash partitions should be part of a partitions sub-node not the flash node itself. Move the partitions which will also allow different bootloaders get rid of the stock partitions easily by removing the partitions node. Signed-off-by: Sebastian Hesselbarth Acked-by: Andrew Lunn --- Cc: Jason Cooper Cc: Andrew Lunn Cc: Gregory Clement Cc: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Cc: Kumar Gala Cc: Russell King Cc: Benoit Masson Cc: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 67 +++++++++++++------------ 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts index 30a0a6eac645..76781fd18624 100644 --- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts +++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts @@ -151,37 +151,42 @@ marvell,nand-enable-arbiter; nand-on-flash-bbt; - partition@0 { - label = "u-boot"; - reg = <0x0000000 0xe0000>; - read-only; - }; - - partition@e0000 { - label = "u-boot-env"; - reg = <0xe0000 0x20000>; - read-only; - }; - - partition@100000 { - label = "u-boot-env2"; - reg = <0x100000 0x20000>; - read-only; - }; - - partition@120000 { - label = "zImage"; - reg = <0x120000 0x400000>; - }; - - partition@520000 { - label = "initrd"; - reg = <0x520000 0x400000>; - }; - - partition@xE00000 { - label = "boot"; - reg = <0xE00000 0x3F200000>; + partitions { + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0000000 0xe0000>; + read-only; + }; + + partition@e0000 { + label = "u-boot-env"; + reg = <0xe0000 0x20000>; + read-only; + }; + + partition@100000 { + label = "u-boot-env2"; + reg = <0x100000 0x20000>; + read-only; + }; + + partition@120000 { + label = "zImage"; + reg = <0x120000 0x400000>; + }; + + partition@520000 { + label = "initrd"; + reg = <0x520000 0x400000>; + }; + + partition@xE00000 { + label = "boot"; + reg = <0xE00000 0x3F200000>; + }; }; }; };