From patchwork Fri Jun 21 11:23:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11009827 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 24C8714B6 for ; Fri, 21 Jun 2019 11:23:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 136DC28A22 for ; Fri, 21 Jun 2019 11:23:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 077EE28A3E; Fri, 21 Jun 2019 11:23:49 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 924B228A22 for ; Fri, 21 Jun 2019 11:23:48 +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: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:In-Reply-To: References:List-Owner; bh=jXlbkMcO3N+aBhLQp5nD2brfaCMc8MAxMrZYhI1/15M=; b=VK8 3ze+ht/60jl4KJ/EWHqPWC+Z/LeAaFLLhOMfunpJoTANEW2gNFuWAy9Q+0pf0yEgR22AwrwxPAaUV l5FEsyUouSfP9KKHWz0iEpmXOCfUaf4srKgJhJZR5NERJwz4Ec2I+teXDi1uSfRY0xDnqm9xedud4 g8QtsqG8OR4i8bu21O+7n19FxEEUvRJdl2Wm3OEiYyEweW5qkC+zIiyvl73z6+MDes1yjmk19zzMm 1zJmXSQWTTYbeuzZ02nZybkMmW8AqI1nzw2jr5c62N6JnV/Qr1mGQyXsfhYHS2hkU1ltCzr8fimrw TQVY6BRORN0T2VFv47qxEffKUeq0Ndg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1heHdv-0003h2-0L; Fri, 21 Jun 2019 11:23:43 +0000 Received: from conuserg-12.nifty.com ([210.131.2.79]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1heHdr-0003gU-2w for linux-arm-kernel@lists.infradead.org; Fri, 21 Jun 2019 11:23:40 +0000 Received: from localhost.localdomain (softbank126205003112.bbtec.net [126.205.3.112]) (authenticated) by conuserg-12.nifty.com with ESMTP id x5LBNBVG009682; Fri, 21 Jun 2019 20:23:12 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com x5LBNBVG009682 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1561116193; bh=QbSpRhPCko1oAe/ciitvIbxO8D+SdDlQvNNtyfUnX9A=; h=From:To:Cc:Subject:Date:From; b=V8ciSa4abgStdvuFnsOHO6f1XVDMZHgkDhQZrC04DNFZYgAhyAsFOdjk/NmqprgGL R888tLjyzguPUC9poWAhvqozzhYxlDBox8hc9CiUFioam4LB1ol7Z43Ig7xNZPIuYc ci+a71SEvpAeaZ206s0SIHPO1Hsm/lRY3Oa8QqJUhstSI2Fu6e08jbnNfafhJPXDNm jpppC1iKF32jSGer3oSrhGZKUsHod8KlyoDsJf2iTpiz8Okej8SDquRJwAY5LEOKqk Od+SPOsJCPlfJYEaBXQDM7+HYuSaZOlw4SxDwpoAm0sMaE4a0Wj72wym337xcS/HwT 1gbY6Zbr78NdQ== X-Nifty-SrcIP: [126.205.3.112] From: Masahiro Yamada To: linux-arm-kernel@lists.infradead.org, Dinh Nguyen Subject: [PATCH] ARM: dts: socfpga: update to new Denali NAND binding Date: Fri, 21 Jun 2019 20:23:06 +0900 Message-Id: <20190621112306.17769-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190621_042339_358665_D5413496 X-CRM114-Status: UNSURE ( 9.26 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Masahiro Yamada , Rob Herring , linux-kernel@vger.kernel.org, devicetree@vger.kernel.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 With commit d8e8fd0ebf8b ("mtd: rawnand: denali: decouple controller and NAND chips"), the Denali NAND controller driver migrated to the new controller/chip representation. Update DT for it. Signed-off-by: Masahiro Yamada --- arch/arm/boot/dts/socfpga.dtsi | 2 +- arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +- .../boot/dts/socfpga_arria10_socdk_nand.dts | 20 ++++++++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index ec1966480f2f..90d6d0d4417d 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -747,7 +747,7 @@ nand0: nand@ff900000 { #address-cells = <0x1>; - #size-cells = <0x1>; + #size-cells = <0x0>; compatible = "altr,socfpga-denali-nand"; reg = <0xff900000 0x100000>, <0xffb80000 0x10000>; diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi index ae24599d5829..677394153f4d 100644 --- a/arch/arm/boot/dts/socfpga_arria10.dtsi +++ b/arch/arm/boot/dts/socfpga_arria10.dtsi @@ -659,7 +659,7 @@ nand: nand@ffb90000 { #address-cells = <1>; - #size-cells = <1>; + #size-cells = <0>; compatible = "altr,socfpga-denali-nand"; reg = <0xffb90000 0x72000>, <0xffb80000 0x10000>; diff --git a/arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts b/arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts index e36e0a0f8aa6..9bd9e04c7361 100644 --- a/arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts +++ b/arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts @@ -9,12 +9,18 @@ &nand { status = "okay"; - partition@nand-boot { - label = "Boot and fpga data"; - reg = <0x0 0x1C00000>; - }; - partition@nand-rootfs { - label = "Root Filesystem - JFFS2"; - reg = <0x1C00000 0x6400000>; + nand@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "Boot and fpga data"; + reg = <0x0 0x1C00000>; + }; + partition@1c00000 { + label = "Root Filesystem - JFFS2"; + reg = <0x1C00000 0x6400000>; + }; }; };