aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-4.4/083-0004-spi-bcm-qspi-don-t-include-linux-mtd-cfi.h.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-03-01 06:52:23 +0100
committerRafał Miłecki <rafal@milecki.pl>2017-03-01 07:02:17 +0100
commit9209511d61fce02b0af48b44d963150e076e0f7e (patch)
tree2791f6e6e7370c8c977bd51e88bfe94eb9b5a022 /target/linux/bcm53xx/patches-4.4/083-0004-spi-bcm-qspi-don-t-include-linux-mtd-cfi.h.patch
parentebf846b00559a326d6ea5a1711d11335d89d1218 (diff)
downloadupstream-9209511d61fce02b0af48b44d963150e076e0f7e.tar.gz
upstream-9209511d61fce02b0af48b44d963150e076e0f7e.tar.bz2
upstream-9209511d61fce02b0af48b44d963150e076e0f7e.zip
bcm53xx: backport Broadcom's iProc QSPI driver
This driver has been added instead of improving spi-bcm53xx. It has some advantages: allows SPI speed control & hopefully doesn't have bug that was stopping us from using multiple SPI messages for writing flash data. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/bcm53xx/patches-4.4/083-0004-spi-bcm-qspi-don-t-include-linux-mtd-cfi.h.patch')
-rw-r--r--target/linux/bcm53xx/patches-4.4/083-0004-spi-bcm-qspi-don-t-include-linux-mtd-cfi.h.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-4.4/083-0004-spi-bcm-qspi-don-t-include-linux-mtd-cfi.h.patch b/target/linux/bcm53xx/patches-4.4/083-0004-spi-bcm-qspi-don-t-include-linux-mtd-cfi.h.patch
new file mode 100644
index 0000000000..f90c02bba0
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.4/083-0004-spi-bcm-qspi-don-t-include-linux-mtd-cfi.h.patch
@@ -0,0 +1,27 @@
+From c0a75d072a501effd66d3392ada8d3f4283b87ef Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Thu, 15 Sep 2016 17:40:15 +0200
+Subject: [PATCH] spi: bcm-qspi: don't include linux/mtd/cfi.h
+
+The header isn't actually needed here, but including it leads
+to a build warning when CONFIG_MTD is disabled:
+
+include/linux/mtd/cfi.h:76:2: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp]
+
+Fixes: fa236a7ef240 (spi: bcm-qspi: Add Broadcom MSPI driver)
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+---
+ drivers/spi/spi-bcm-qspi.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/spi/spi-bcm-qspi.c
++++ b/drivers/spi/spi-bcm-qspi.c
+@@ -25,7 +25,6 @@
+ #include <linux/ioport.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+-#include <linux/mtd/cfi.h>
+ #include <linux/mtd/spi-nor.h>
+ #include <linux/of.h>
+ #include <linux/of_irq.h>