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: 167382 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp609403ilk; Fri, 21 Jun 2019 04:23:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqzRccpzQE1/imnwzJjNLMgbtoa6Xdj7/sh54lcpaQY0sWravdk0AsNK+M2VcnXilwKEDgvM X-Received: by 2002:a65:62cb:: with SMTP id m11mr3052621pgv.27.1561116226125; Fri, 21 Jun 2019 04:23:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561116226; cv=none; d=google.com; s=arc-20160816; b=Mg+Fsw2rVFn0GSE2DUFjVrpps1Xr7hsI7tpWkQI3LmSLoYik0kBwBBRTESR9Wb5/u4 mGk+Tr0phx2tar73eoH2ulAi2uefpUJFyN4482cYRdWGq6KDwD2p86S/Z/R5r4bLQWto Ly3pDpx/jqEEmviJp/YyFigxpwKe/Gnhb3N0eRNBTrHNHtmtgR6yU+xkGRYBZvsXPQOw LhigxBIZKhnsrCxU5TTxfXY6ak3FsrBJQF4WZgZArR/SFywEYxXFXoPsyRlveAb0kaXm 3aFDPuLsbYTt5ulhy9CgSXdu8LRN34CJGkr1VNSGZ92HZnr6I+lZ8t6RZYTikfBEsuKk ILeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=QbSpRhPCko1oAe/ciitvIbxO8D+SdDlQvNNtyfUnX9A=; b=YDidDrqGw1e0gxbtakL+8mxS9RLSkkOc0mH9b+LqW5Thqpy20ct6Ax13+Zsa84Or0P DvEJXckNvMDeWq9rU6WLKrpz0lcIgMF3E51lZ65JHwmMp7wi/70Bo6dZ5gwk/3D1Qtgc QtG/5t1PfHsfXIx4KzrvCCdC0yPo5vLTL5/qe1QZmSn7oOPh7cl8/fhiLXjhHWJmiWrI qoqhmWGTla7nlmaSjjen80cNuUAv2VVvy3Qaz+I+Mocgwfc3LuHZmvO+zdGplQtOyxdo 17D7HjFI8v7W0XBF5X7b+5pVmJ1oEOoru0WRcmXWSeqc71dNxB7QmsM/uSeUe5zh9xt7 N8TA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=V8ciSa4a; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l21si2302228pgk.514.2019.06.21.04.23.45; Fri, 21 Jun 2019 04:23:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=V8ciSa4a; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726360AbfFULXp (ORCPT + 8 others); Fri, 21 Jun 2019 07:23:45 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:51955 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726339AbfFULXp (ORCPT ); Fri, 21 Jun 2019 07:23:45 -0400 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 Cc: Masahiro Yamada , devicetree@vger.kernel.org, Mark Rutland , Rob Herring , linux-kernel@vger.kernel.org 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 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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(-) -- 2.17.1 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>; + }; }; };