linux-kernel - [RFC 08/12] ARM: dts: armada-375: use reworked NAND controller driver

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20171018143629.29302-9-miquel.raynal@free-electrons.com>
Date:   Wed, 18 Oct 2017 16:36:25 +0200
From:   Miquel Raynal <miquel.raynal@...e-electrons.com>
To:     Andrew Lunn <andrew@...n.ch>,
        bcm-kernel-feedback-list@...adcom.com,
        Boris Brezillon <boris.brezillon@...e-electrons.com>,
        Brian Norris <computersforpeace@...il.com>,
        Catalin Marinas <catalin.marinas@....com>,
        Chen-Yu Tsai <wens@...e.org>,
        Cyrille Pitchen <cyrille.pitchen@...ev4u.fr>,
        Daniel Mack <daniel@...que.org>,
        David Woodhouse <dwmw2@...radead.org>,
        devel@...verdev.osuosl.org, devicetree@...r.kernel.org,
        Ezequiel Garcia <ezequiel.garcia@...e-electrons.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Gregory Clement <gregory.clement@...e-electrons.com>,
        Han Xu <han.xu@....com>,
        Haojian Zhuang <haojian.zhuang@...il.com>,
        Jason Cooper <jason@...edaemon.net>,
        Josh Wu <rainyfeeling@...look.com>,
        Kamal Dasu <kdasu.kdev@...il.com>,
        linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
        linux-mediatek@...ts.infradead.org, linux-mtd@...ts.infradead.org,
        Marc Gonzalez <marc_gonzalez@...madesigns.com>,
        Marek Vasut <marek.vasut@...il.com>,
        Mark Rutland <mark.rutland@....com>,
        Masahiro Yamada <yamada.masahiro@...ionext.com>,
        Matthias Brugger <matthias.bgg@...il.com>,
        Maxime Ripard <maxime.ripard@...e-electrons.com>,
        Maxim Levitsky <maximlevitsky@...il.com>,
        Richard Weinberger <richard@....at>,
        Robert Jarzmik <robert.jarzmik@...e.fr>,
        Rob Herring <robh+dt@...nel.org>,
        Russell King <linux@...linux.org.uk>,
        Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>,
        Stefan Agner <stefan@...er.ch>,
        Sylvain Lemieux <slemieux.tyco@...il.com>,
        Vladimir Zapolskiy <vz@...ia.com>,
        Wenyou Yang <wenyou.yang@...el.com>,
        Will Deacon <will.deacon@....com>
Cc:     Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>,
        Antoine Tenart <antoine.tenart@...e-electrons.com>,
        Miquel Raynal <miquel.raynal@...e-electrons.com>,
        Igor Grinberg <grinberg@...pulab.co.il>,
        Nadav Haklai <nadavh@...vell.com>,
        Ofer Heifetz <oferh@...vell.com>,
        Neta Zur Hershkovits <neta@...vell.com>,
        Hanna Hawa <hannah@...vell.com>
Subject: [RFC 08/12] ARM: dts: armada-375: use reworked NAND controller driver

Change the bindings to use 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, inefective with
Armada boards.

Signed-off-by: Miquel Raynal <miquel.raynal@...e-electrons.com>
---
 arch/arm/boot/dts/armada-375-db.dts | 49 ++++++++++++++++++++++---------------
 arch/arm/boot/dts/armada-375.dtsi   |  6 ++---
 2 files changed, 32 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..42277a554063 100644
--- a/arch/arm/boot/dts/armada-375-db.dts
+++ b/arch/arm/boot/dts/armada-375-db.dts
@@ -140,28 +140,37 @@
 	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@...000 {
-		label = "Linux";
-		reg = <0x800000 0x800000>;
-	};
-	partition@...0000 {
-		label = "Filesystem";
-		reg = <0x1000000 0x3f000000>;
+
+	nand@0 {
+		reg = <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@...000 {
+				label = "Linux";
+				reg = <0x800000 0x800000>;
+			};
+			partition@...0000 {
+				label = "Filesystem";
+				reg = <0x1000000 0x3f000000>;
+			};
+		};
 	};
 };
 
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi
index 7225c7ce9a8d..db66b5f29834 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@...00 {
-				compatible = "marvell,armada370-nand";
+			nand_controller: nand-controller@...00 {
+				compatible = "marvell,armada370-nand-controller";
 				reg = <0xd0000 0x54>;
 				#address-cells = <1>;
-				#size-cells = <1>;
+				#size-cells = <0>;
 				interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&gateclk 11>;
 				status = "disabled";
-- 
2.11.0