{"id":818278,"url":"http://patchwork.ozlabs.org/api/patches/818278/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-mtd/patch/20170925145352.13145-4-miquel.raynal@free-electrons.com/","project":{"id":3,"url":"http://patchwork.ozlabs.org/api/projects/3/?format=json","name":"Linux MTD development","link_name":"linux-mtd","list_id":"linux-mtd.lists.infradead.org","list_email":"linux-mtd@lists.infradead.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170925145352.13145-4-miquel.raynal@free-electrons.com>","list_archive_url":null,"date":"2017-09-25T14:53:52","name":"[3/3] arm64: dts: marvell: add NAND support on the 7040-DB board","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"29f5eca0c1b0caae1c1718479bc02ed095308d8d","submitter":{"id":71917,"url":"http://patchwork.ozlabs.org/api/people/71917/?format=json","name":"Miquel Raynal","email":"miquel.raynal@free-electrons.com"},"delegate":{"id":58324,"url":"http://patchwork.ozlabs.org/api/users/58324/?format=json","username":"bbrezillon","first_name":"Boris","last_name":"Brezillon","email":"boris.brezillon@free-electrons.com"},"mbox":"http://patchwork.ozlabs.org/project/linux-mtd/patch/20170925145352.13145-4-miquel.raynal@free-electrons.com/mbox/","series":[{"id":4976,"url":"http://patchwork.ozlabs.org/api/series/4976/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-mtd/list/?series=4976","date":"2017-09-25T14:53:50","name":"Enable NAND on Armada-7040-DB board","version":1,"mbox":"http://patchwork.ozlabs.org/series/4976/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818278/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818278/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (mailfrom)\n\tsmtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133;\n\thelo=bombadil.infradead.org;\n\tenvelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"oiFjw01h\"; \n\tdkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y16dk53Z5z9tXD\n\tfor ;\n\tTue, 26 Sep 2017 00:58:02 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dwUpY-0008E9-2N; Mon, 25 Sep 2017 14:57:56 +0000","from mail.free-electrons.com ([62.4.15.54])\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dwUmi-0004tp-P5; Mon, 25 Sep 2017 14:55:10 +0000","by mail.free-electrons.com (Postfix, from userid 110)\n\tid 1C1C42087B; Mon, 25 Sep 2017 16:54:41 +0200 (CEST)","from localhost.localdomain\n\t(LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id A476D207E1;\n\tMon, 25 Sep 2017 16:54:30 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:\n\tList-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References:\n\tIn-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID:\n\tContent-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc\n\t:Resent-Message-ID:List-Owner;\n\tbh=tlraxJ79UB79KhII14rHLtLFrHKuzdkzisahwPKU7H8=;\n\tb=oiFjw01hVGWpo6Z/rwb1yL1tJL\n\tOjN5du098m/KO60nHlNeXfPBoLGdnRIxNrcXWG/iDd/DE+ZZ9Wry8zHqXjpzSeD9k1ntd61GNOqiT\n\ttiHge1g0ZirSjPArwrFUoFoZN/fDsRMY+S7s8+8CRR5gsxhFBoxJ25oDR0PpPDgUIeDZ8tdIT5X7x\n\tE4LzO0e5zqVnXzV1Hl+R0Nl1AGOrc9InzcQJJflIsT8aAy4Wv1HOIogkWI4Aei767Q2S8+6JAe4LU\n\thYh4Li+qF6zAIyuc3qNNE41yIarQ535TnRCUuxP+dHn/ZVRxEUCDRxjNpyXPfEtoWsCcQSM5xXNND\n\t8i9y2rVg==;","X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on\n\tmail.free-electrons.com","X-Spam-Level":"","X-Spam-Status":"No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT,\n\tURIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0","From":"Miquel Raynal ","To":"David Woodhouse ,\n\tBrian Norris ,\n\tBoris Brezillon ,\n\tMarek Vasut ,\n\tRichard Weinberger , \n\tCyrille Pitchen ,\n\tJason Cooper , Andrew Lunn ,\n\tGregory Clement ,\n\tSebastian Hesselbarth ,\n\tEzequiel Garcia ,\n\tlinux-mtd@lists.infradead.org, devicetree@vger.kernel.org,\n\tlinux-arm-kernel@lists.infradead.org","Subject":"[PATCH 3/3] arm64: dts: marvell: add NAND support on the 7040-DB\n\tboard","Date":"Mon, 25 Sep 2017 16:53:52 +0200","Message-Id":"<20170925145352.13145-4-miquel.raynal@free-electrons.com>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170925145352.13145-1-miquel.raynal@free-electrons.com>","References":"<20170925145352.13145-1-miquel.raynal@free-electrons.com>","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170925_075501_329282_99E0C356 ","X-CRM114-Status":"GOOD ( 14.33 )","X-Spam-Score":"-1.9 (-)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-1.9 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.0 SPF_PASS SPF: sender matches SPF record\n\t-0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay\n\tdomain\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]","X-BeenThere":"linux-mtd@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"Linux MTD discussion mailing list ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Thomas Petazzoni ,\n\tNadav Haklai ,\n\tAntoine Tenart ,\n\tMiquel Raynal ","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"linux-mtd\" ","Errors-To":"linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"From: Gregory CLEMENT \n\nThe NAND controller used in A7K/A8K is present on the CP110 master part.\nIt is compatible with the pxa3xx_nand driver but requires the use of the\nmarvell,armada-8k-nand compatible string due to the need to first enable\nthe NAND controller.\n\nAdd properties to the NAND node to fit the bindings constraints of the\npxa3xx_nand driver and enable the NAND controller.\n\nAdd the 'marvell,system-controller' property to the cp110 master NAND\nnode with a reference to the syscon node. This is new compared to other\nboards using the pxa3xx_nand driver and it is needed to be bootloader\nindependent and enable the NAND controller from the NAND controller\ndriver itself by writing in these syscon registers.\n\nSigned-off-by: Gregory CLEMENT \n[miquel.raynal@free-electrons.com: add NAND ready/busy MPP subnode,\nchange compatible string to fit the needs of the A7k/A8k SoCs and add\nthe system controller property]\nSigned-off-by: Miquel Raynal \n---\n arch/arm64/boot/dts/marvell/armada-7040-db.dts | 24 ++++++++++++++++++++++\n arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 14 +++++++++++++\n .../boot/dts/marvell/armada-cp110-master.dtsi | 3 ++-\n 3 files changed, 40 insertions(+), 1 deletion(-)","diff":"diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts\nindex 9c3bdf87e543..b98cf265bae5 100644\n--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts\n+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts\n@@ -144,6 +144,30 @@\n \t};\n };\n \n+&cpm_nand {\n+\tstatus = \"okay\";\n+\tnum-cs = <1>;\n+\tpinctrl-0 = <&nand_pins>, <&nand_rb>;\n+\tpinctrl-names = \"default\";\n+\tnand-ecc-strength = <4>;\n+\tnand-ecc-step-size = <512>;\n+\tmarvell,nand-enable-arbiter;\n+\tnand-on-flash-bbt;\n+\n+\tpartition@0 {\n+\t\tlabel = \"U-Boot\";\n+\t\treg = <0 0x200000>;\n+\t};\n+\tpartition@200000 {\n+\t\tlabel = \"Linux\";\n+\t\treg = <0x200000 0xe00000>;\n+\t};\n+\tpartition@1000000 {\n+\t\tlabel = \"Filesystem\";\n+\t\treg = <0x1000000 0x3f000000>;\n+\t};\n+};\n+\n &cpm_spi1 {\n \tstatus = \"okay\";\n \ndiff --git a/arch/arm64/boot/dts/marvell/armada-70x0.dtsi b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi\nindex 860b6ae9dcc5..0e1a1e5be399 100644\n--- a/arch/arm64/boot/dts/marvell/armada-70x0.dtsi\n+++ b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi\n@@ -64,5 +64,19 @@\n &cpm_syscon0 {\n \tcpm_pinctrl: pinctrl {\n \t\tcompatible = \"marvell,armada-7k-pinctrl\";\n+\n+\t\tnand_pins: nand-pins {\n+\t\t\tmarvell,pins =\n+\t\t\t\"mpp15\", \"mpp16\", \"mpp17\", \"mpp18\",\n+\t\t\t\"mpp19\", \"mpp20\", \"mpp21\", \"mpp22\",\n+\t\t\t\"mpp23\", \"mpp24\", \"mpp25\", \"mpp26\",\n+\t\t\t\"mpp27\";\n+\t\t\tmarvell,function = \"dev\";\n+\t\t};\n+\n+\t\tnand_rb: nand-rb {\n+\t\t\tmarvell,pins = \"mpp13\";\n+\t\t\tmarvell,function = \"nf\";\n+\t\t};\n \t};\n };\ndiff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi\nindex 8263a8a504a8..d41b41b613ec 100644\n--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi\n+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi\n@@ -274,12 +274,13 @@\n \t\t\t\t * this controller is only usable on the CPM\n \t\t\t\t * for A7K and on the CPS for A8K.\n \t\t\t\t */\n-\t\t\t\tcompatible = \"marvell,armada370-nand\";\n+\t\t\t\tcompatible = \"marvell,armada-8k-nand\";\n \t\t\t\treg = <0x720000 0x54>;\n \t\t\t\t#address-cells = <1>;\n \t\t\t\t#size-cells = <1>;\n \t\t\t\tinterrupts = ;\n \t\t\t\tclocks = <&cpm_clk 1 2>;\n+\t\t\t\tmarvell,system-controller = <&cpm_syscon0>;\n \t\t\t\tstatus = \"disabled\";\n \t\t\t};\n \n","prefixes":["3/3"]}