summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorYe.Li <B37916@freescale.com>2014-07-17 17:46:16 +0800
committerYe.Li <B37916@freescale.com>2014-07-17 18:01:55 +0800
commitbe2c5fd0cd52f2f63d2dc11cea213028e1303249 (patch)
tree13a852abd65aaaad35b6e935e89e79d9fd169081 /arch
parentaef061cd811fb4f2de6c81094225f66b3a16de50 (diff)
ENGR00323027 MTD:QuadSPI: Remove the M4 checking workaround
The QuadSPI driver has a workaround to check if M4 is using QuadSPI NOR flash. When M4 is running on QuadSPI NOR, the QuadSPI driver will quit. This workaround has a bug when system booting from QuadSPI NOR. Therefore, removed the workaround and disabled the QuadSPI driver in MCC specific DTB. The MCC DTB will let the QuadSPI driver to disabled, not conflict with M4. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 6733ca3382ddb6358f4ccf8dd4f16d8f65995241)
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6sx-sdb-m4.dts4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6sx-sdb-m4.dts b/arch/arm/boot/dts/imx6sx-sdb-m4.dts
index aa52ca7308d8..3258075f27cd 100644
--- a/arch/arm/boot/dts/imx6sx-sdb-m4.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb-m4.dts
@@ -35,3 +35,7 @@
&adc2 {
status = "disabled";
};
+
+&qspi2 {
+ status = "disabled";
+};