From patchwork Fri Nov 20 01:05:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 7663011 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 D4C3A9F392 for ; Fri, 20 Nov 2015 01:06:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1CD0020396 for ; Fri, 20 Nov 2015 01:06:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B5AB20444 for ; Fri, 20 Nov 2015 01:06:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161622AbbKTBGA (ORCPT ); Thu, 19 Nov 2015 20:06:00 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:45558 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161210AbbKTBF7 (ORCPT ); Thu, 19 Nov 2015 20:05:59 -0500 Received: from penelope.kanocho.kobe.vergenet.net (50-206-118-3-static.hfc.comcastbusiness.net [50.206.118.3]) by kirsty.vergenet.net (Postfix) with ESMTPSA id AECBC25BE52; Fri, 20 Nov 2015 12:05:42 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1447981542; bh=FcmaC3l91DIk+fs0K15WhxwMVB4/MNJN0Bm8oP+70Wg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RnegM8XlpGa0R1vbpGdVbTk+bdK+El1u1SImZs4sFUv5Yr1q8S11e/cQ82dTH8DbU uujqOzTj1rRyVMRimGUUGjOB4l0IckfMdopC13nDijVC/BfuS5t6i2nmL9Kx6sj94+ pwbKK07ML2eNkXkLJ6oy1s0HISMFj8XLCCs9vALc= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id AC5E4621A2; Thu, 19 Nov 2015 17:05:38 -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 15/29] ARM: shmobile: koelsch: Move SPI FLASH partitions to subnode Date: Thu, 19 Nov 2015 17:05:22 -0800 Message-Id: <27fa0a6c55537f8d8656b9e59ae584b0b427232a.1447981420.git.horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: 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: spi0.0: 'partitions' subnode not found on /spi@e6b10000/flash@0. Trying to parse direct subnodes as partitions. Hence move the SPI FLASH partitions to a "partitions" subnode. Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7791-koelsch.dts | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index 98da99d1b7dc..4ec2d1fba7c9 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts @@ -479,8 +479,6 @@ status = "okay"; flash: flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "spansion,s25fl512s", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <30000000>; @@ -490,19 +488,24 @@ spi-cpol; m25p,fast-read; - partition@0 { - label = "loader"; - reg = <0x00000000 0x00080000>; - read-only; - }; - partition@80000 { - label = "user"; - reg = <0x00080000 0x00580000>; - read-only; - }; - partition@600000 { - label = "flash"; - reg = <0x00600000 0x03a00000>; + partitions { + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "loader"; + reg = <0x00000000 0x00080000>; + read-only; + }; + partition@80000 { + label = "user"; + reg = <0x00080000 0x00580000>; + read-only; + }; + partition@600000 { + label = "flash"; + reg = <0x00600000 0x03a00000>; + }; }; }; };