From: Allen Xu <b45815@freescale.com>
Date: Sat, 22 Nov 2014 19:15:19 +0000 (-0600)
Subject: MLK-9909 ARM: dts: add imx6sx sdb revA QSPI legacy support
X-Git-Tag: C0P2-H0.0--20200415~3973
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=badf9fb4be53a2e38f14d4ca71d03cd4d4fe66a2;p=linux.git

MLK-9909 ARM: dts: add imx6sx sdb revA QSPI legacy support

add sdb revA board QSPI legacy support for Spansion QSPI chip.

Signed-off-by: Allen Xu <b45815@freescale.com>
(cherry picked and merge from commit 3fd143ae78007e58d1dc45bc829b462a12b93cd2)
(cherry picked from commit 8317ae5998a20b3303a2a9209c29ab5674e09dc3)
---

diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
index f722caef08c2..8b5af2c0f8e4 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
@@ -36,6 +36,7 @@
 	pinctrl-0 = <&pinctrl_qspi2>;
 	status = "okay";
 
+#ifndef SPANSIONFLASH
 	flash0: n25q256a@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -51,6 +52,7 @@
 		spi-max-frequency = <29000000>;
 		reg = <1>;
 	};
+#endif
 };
 
 &usbphy1 {