From patchwork Mon Apr 17 12:46:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 9683827 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 01D30600C5 for ; Mon, 17 Apr 2017 12:48:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4F8F22B26 for ; Mon, 17 Apr 2017 12:48:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D990A26E16; Mon, 17 Apr 2017 12:48:10 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5399922B26 for ; Mon, 17 Apr 2017 12:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=8TJgIWDkA5RXRdU9EwDHnIROCcsQhpaqDo/iH7UwXak=; b=RqO6MzPIJw1pbSmIV1qR3PR8fx Q76uNoBKCwn0nCkVPJoFgRmVrqUGPIoTpZyGloUsz1yAEkiKeh/gZSuM7HKHE3HMJxhY+aG5M8Mvw cAkJRZ93+FEg3ql2vQN/OqBl2CTn4k3ftHtDccJkaMbg6V9f07cTt+9u/dKJhsdlQH1CLGfQQB890 FNKXKgffigBMQy9v8xQlqKJVcC22RNRKyh/0vvLfK83fz0pTuIrZtRBCMFKh8xQbbaf0PD2h/rZx1 IeHEY1tF3P643Dbxjb7q81iPMqb7y4x8VGLEbEOLcb6zW+Q+iOw7dzmMp8kbYv9lBYOpLfBFoLoo5 Ro2Hfpdw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d064f-0004lb-QR; Mon, 17 Apr 2017 12:48:09 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d064S-0004HM-RN for linux-arm-kernel@lists.infradead.org; Mon, 17 Apr 2017 12:47:59 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id C7F7C207F1; Mon, 17 Apr 2017 14:47:37 +0200 (CEST) Received: from localhost (132.230.147.77.rev.sfr.net [77.147.230.132]) by mail.free-electrons.com (Postfix) with ESMTPSA id 473FD207F4; Mon, 17 Apr 2017 14:47:27 +0200 (CEST) From: Thomas Petazzoni To: arm-soc , Michael Turquette , Stephen Boyd , linux-clk@vger.kernel.org, Arnd Bergmann , Olof Johansson Subject: [PATCH v2 4/7] arm: spear6xx: switch spear600-evb to the new flash partition DT binding Date: Mon, 17 Apr 2017 14:46:42 +0200 Message-Id: <1492433205-13376-5-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492433205-13376-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1492433205-13376-1-git-send-email-thomas.petazzoni@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170417_054757_048452_E4428932 X-CRM114-Status: GOOD ( 10.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , Viresh Kumar , 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 This commit moves spear600-evb.dts to use the new flash partition Device Tree binding documented in Documentation/devicetree/bindings/mtd/partition.txt. As this Device Tree binding document says: "For backwards compatibility partitions as direct subnodes of the mtd device are supported. This use is discouraged." Signed-off-by: Thomas Petazzoni Acked-by: Viresh Kumar --- arch/arm/boot/dts/spear600-evb.dts | 54 ++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/arch/arm/boot/dts/spear600-evb.dts b/arch/arm/boot/dts/spear600-evb.dts index 32a44b6..f36603f 100644 --- a/arch/arm/boot/dts/spear600-evb.dts +++ b/arch/arm/boot/dts/spear600-evb.dts @@ -58,34 +58,38 @@ clock-rate = <50000000>; flash@f8000000 { - #address-cells = <1>; - #size-cells = <1>; reg = <0xf8000000 0x800000>; st,smi-fast-mode; - partition@0 { - label = "xloader"; - reg = <0x0 0x10000>; - }; - partition@10000 { - label = "u-boot"; - reg = <0x10000 0x50000>; - }; - partition@60000 { - label = "environment"; - reg = <0x60000 0x10000>; - }; - partition@70000 { - label = "dtb"; - reg = <0x70000 0x10000>; - }; - partition@80000 { - label = "linux"; - reg = <0x80000 0x310000>; - }; - partition@390000 { - label = "rootfs"; - reg = <0x390000 0x0>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "xloader"; + reg = <0x0 0x10000>; + }; + partition@10000 { + label = "u-boot"; + reg = <0x10000 0x50000>; + }; + partition@60000 { + label = "environment"; + reg = <0x60000 0x10000>; + }; + partition@70000 { + label = "dtb"; + reg = <0x70000 0x10000>; + }; + partition@80000 { + label = "linux"; + reg = <0x80000 0x310000>; + }; + partition@390000 { + label = "rootfs"; + reg = <0x390000 0x0>; + }; }; }; };