From patchwork Fri Nov 20 19:38:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 7670961 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@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 48C9F9F1C2 for ; Fri, 20 Nov 2015 19:39:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ADD4D203F1 for ; Fri, 20 Nov 2015 19:39:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0BB3B20437 for ; Fri, 20 Nov 2015 19:39:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163289AbbKTTjD (ORCPT ); Fri, 20 Nov 2015 14:39:03 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:58979 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162988AbbKTTjC (ORCPT ); Fri, 20 Nov 2015 14:39:02 -0500 Received: from penelope.kanocho.kobe.vergenet.net (ip-64-134-231-5.public.wayport.net [64.134.231.5]) by kirsty.vergenet.net (Postfix) with ESMTPSA id 7A48125B799; Sat, 21 Nov 2015 06:39:00 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1448048340; bh=hzE79Mv/mHzYIh3GffFMLh6lNTxxROtINItnmdlPbMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QDaEGsozBW9wGwTvcm9rG2FatgGXwSypHxKl1E83jAe3Ur1rOuxiGlkhyRHzSlQ+s cqty5+7BxUjFabKU0DrapbCpuDB7fACJk9qhlOW43LC9Xcs5fV4dGWgqa7ST8WhFGH AZUgjduyDAPpYOMPMZujO3jF5rHNRj0MqYeMC0f0= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id 83D3460531; Fri, 20 Nov 2015 11:38:58 -0800 (PST) From: Simon Horman To: linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , Geert Uytterhoeven , Simon Horman Subject: [PATCH 4/4] ARM: shmobile: silk: Move SPI FLASH partitions to subnode Date: Fri, 20 Nov 2015 11:38:55 -0800 Message-Id: <1448048335-23927-5-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1448048335-23927-1-git-send-email-horms+renesas@verge.net.au> References: <1448048335-23927-1-git-send-email-horms+renesas@verge.net.au> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 From: Geert Uytterhoeven As of commits 5cfdedb7b9a0fe38 ("mtd: ofpart: move ofpart partitions to a dedicated dt node") and fe2585e9c29a650a ("doc: dt: mtd: support partitions in a special 'partitions' subnode"), having partitions as direct subnodes of an mtd device is discouraged. Hence move the SPI FLASH partitions to a "partitions" subnode. Based on similar work for the koelsch board by Geert Uytterhoeven. Cc: Geert Uytterhoeven Signed-off-by: Simon Horman --- * Compile tested only --- arch/arm/boot/dts/r8a7794-silk.dts | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts index a49942b626c8..58f0ddf21c17 100644 --- a/arch/arm/boot/dts/r8a7794-silk.dts +++ b/arch/arm/boot/dts/r8a7794-silk.dts @@ -194,8 +194,6 @@ status = "okay"; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "spansion,s25fl512s", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <30000000>; @@ -205,19 +203,24 @@ spi-cpha; m25p,fast-read; - partition@0 { - label = "loader"; - reg = <0x00000000 0x00040000>; - read-only; - }; - partition@40000 { - label = "user"; - reg = <0x00040000 0x00400000>; - read-only; - }; - partition@440000 { - label = "flash"; - reg = <0x00440000 0x03bc0000>; + partitions { + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "loader"; + reg = <0x00000000 0x00040000>; + read-only; + }; + partition@40000 { + label = "user"; + reg = <0x00040000 0x00400000>; + read-only; + }; + partition@440000 { + label = "flash"; + reg = <0x00440000 0x03bc0000>; + }; }; }; };