From patchwork Thu Dec 7 20:18:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10100951 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 ABF6E60325 for ; Thu, 7 Dec 2017 20:35:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CCA01FFFF for ; Thu, 7 Dec 2017 20:35:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9057528470; Thu, 7 Dec 2017 20:35:13 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham 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 0866C1FFFF for ; Thu, 7 Dec 2017 20:35:12 +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=Y86CFDAWZuu864QO84iymJy9yhQ4IhXV2w4E6m/Rzz4=; b=TswjT0DIWndrk65Jt/XofHkdgc fRN0eqWYDCJtuYckW9ftKPxq1ONQF29tq6vVQadOKkafAJewWF/60FXH7OpB8TwxVO4HgSXhlAYb0 9H7GFLRMW+rpURMEj+hxbSpn3zyOubeGKphYpZIHibhRbBP7eIAUpepQM6C9tFlc2dfOJslL8VuoX lYxYdpa9VgV1FCjC30xLBSrHGo/icIKZ3P3ovBGq801avFvvIaXtTxV9LviCDLilg87rDK/p1Jg6+ b7pExO+MSNYtIj1qTDfvc0kyWZH0st6uLJIkn+92dsOtdXa+olW6pBmLdjLofFZgD8yu3Owwq8Rtc jE6m5mYg==; 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 1eN2ss-0000OG-BB; Thu, 07 Dec 2017 20:35:06 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eN2ed-0005Vc-5r; Thu, 07 Dec 2017 20:20:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=dq1hTtxMYXAEVkCyofARLTKCaBQd9jifYg6NFY61IGg=; b=0A3sgz19OnPcYfDKRQop5x5OF /lsN4PaU5ZvNVfKP61Yn9amgeRtQvsHPBM8RRcWLGpzzBTEG4IgQjibsTD9h7J4cJ3t2hVcl07Lu2 5RwZjyWfDjyttxsm0oNSGzCB97APfuslAK0uWjIOPskllKX/l3R6jVd3cPxCjVacjDeXn6KFu4+Mz Xd01OwvOEJJXji7AYYX72cr8z5i5It/wJAtW0Pu9cxHiA3ZQqw9TmEDexLF62F1gD7te5T816y7GI YKboR8XZ/zbqKF7Xws7sCS+qQUt75L8VGv8Cv5BbkmcGHhV2bqH0Yl6ImqcU2cFYERRyNmEKZoW1I jsW0UtjQA==; Received: from mail.free-electrons.com ([62.4.15.54]) by merlin.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eN2eY-0003Ww-UL; Thu, 07 Dec 2017 20:20:20 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 82DDC20D9C; Thu, 7 Dec 2017 21:19:55 +0100 (CET) Received: from localhost.localdomain (unknown [109.190.253.11]) by mail.free-electrons.com (Postfix) with ESMTPSA id 9C09520D86; Thu, 7 Dec 2017 21:19:34 +0100 (CET) From: Miquel Raynal To: David Woodhouse , Brian Norris , Boris Brezillon , Marek Vasut , Richard Weinberger , Cyrille Pitchen , Rob Herring , Mark Rutland , Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Russell King , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Eric Miao , Catalin Marinas , Will Deacon , Ezequiel Garcia Subject: [PATCH 07/12] ARM: dts: armada-375: use reworked NAND controller driver Date: Thu, 7 Dec 2017 21:18:09 +0100 Message-Id: <20171207201814.30411-8-miquel.raynal@free-electrons.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171207201814.30411-1-miquel.raynal@free-electrons.com> References: <20171207201814.30411-1-miquel.raynal@free-electrons.com> 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 , devicetree@vger.kernel.org, Antoine Tenart , Nadav Haklai , linux-mtd@lists.infradead.org, Miquel Raynal , Neta Zur Hershkovits , Hanna Hawa , Ofer Heifetz , 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 Use the new bindings of the reworked Marvell NAND controller driver. Also adapt the nand controller node organization to distinguish which property is relevant for the controller, and which one is NAND chip specific. Expose the partitions as a subnode of the NAND chip. Remove the 'marvell,nand-enable-arbiter' property, not needed anymore as the driver activates the arbiter by default for all boards (either needed or harmless). Signed-off-by: Miquel Raynal --- arch/arm/boot/dts/armada-375-db.dts | 50 ++++++++++++++++++++++--------------- arch/arm/boot/dts/armada-375.dtsi | 6 ++--- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts index bcdbb8ba1d65..d33cca4e315d 100644 --- a/arch/arm/boot/dts/armada-375-db.dts +++ b/arch/arm/boot/dts/armada-375-db.dts @@ -140,28 +140,38 @@ nr-ports = <2>; }; -&nand { +&nand_controller { + status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; - status = "okay"; - num-cs = <1>; - marvell,nand-keep-config; - marvell,nand-enable-arbiter; - nand-on-flash-bbt; - nand-ecc-strength = <4>; - nand-ecc-step-size = <512>; - - partition@0 { - label = "U-Boot"; - reg = <0 0x800000>; - }; - partition@800000 { - label = "Linux"; - reg = <0x800000 0x800000>; - }; - partition@1000000 { - label = "Filesystem"; - reg = <0x1000000 0x3f000000>; + + nand@0 { + reg = <0>; + label = "pxa3xx_nand-0"; + marvell,rb = <0>; + marvell,nand-keep-config; + nand-on-flash-bbt; + nand-ecc-strength = <4>; + nand-ecc-step-size = <512>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "U-Boot"; + reg = <0 0x800000>; + }; + partition@800000 { + label = "Linux"; + reg = <0x800000 0x800000>; + }; + partition@1000000 { + label = "Filesystem"; + reg = <0x1000000 0x3f000000>; + }; + }; }; }; diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi index 2cb1bcd30976..46471173c7c1 100644 --- a/arch/arm/boot/dts/armada-375.dtsi +++ b/arch/arm/boot/dts/armada-375.dtsi @@ -539,11 +539,11 @@ status = "disabled"; }; - nand: nand@d0000 { - compatible = "marvell,armada370-nand"; + nand_controller: nand-controller@d0000 { + compatible = "marvell,armada370-nand-controller"; reg = <0xd0000 0x54>; #address-cells = <1>; - #size-cells = <1>; + #size-cells = <0>; interrupts = ; clocks = <&gateclk 11>; status = "disabled";