| Message ID | 20190325183017.22278-1-andrew.smirnov@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | 5f0a88a1aabb2b332e2fa01598cc24e708552771 |
| Headers | show |
| Series | ARM: dts: vf610-zii-cfu1: Disable NOR flash/SPI controller | expand |
On Mon, Mar 25, 2019 at 11:30:17AM -0700, Andrey Smirnov wrote: > 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 Applied, thanks.
diff --git a/arch/arm/boot/dts/vf610-zii-cfu1.dts b/arch/arm/boot/dts/vf610-zii-cfu1.dts index 6c78122401a1..afc25b33bd3b 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>;
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 --- arch/arm/boot/dts/vf610-zii-cfu1.dts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)