From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Mon, 25 Mar 2019 18:30:17 +0000 (-0700)
Subject: ARM: dts: vf610-zii-cfu1: Disable NOR flash/SPI controller
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5f0a88a1aabb2b332e2fa01598cc24e708552771;p=linux.git

ARM: dts: vf610-zii-cfu1: Disable NOR flash/SPI controller

Only a certain number of CFU1's come with NOR flash populated. Disable
it by default to avoid trying to probe NOR flash on devices that don't
have it. Devices that do have it can rely on the bootloader to enable
this node.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---

diff --git a/arch/arm/boot/dts/vf610-zii-cfu1.dts b/arch/arm/boot/dts/vf610-zii-cfu1.dts
index 6c78122401a1f..afc25b33bd3b5 100644
--- a/arch/arm/boot/dts/vf610-zii-cfu1.dts
+++ b/arch/arm/boot/dts/vf610-zii-cfu1.dts
@@ -87,7 +87,12 @@
 	bus-num = <1>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_dspi1>;
-	status = "okay";
+	/*
+	 * Some CFU1s come with SPI-NOR chip DNPed, so we leave this
+	 * node disabled by default and rely on bootloader to enable
+	 * it when appropriate.
+	 */
+	status = "disabled";
 
 	m25p128@0 {
 		#address-cells = <1>;