From 174ce4c56d742712696e546eecee3d89e05c909a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Tue, 7 Feb 2017 13:09:50 +0100 Subject: kernel: update spi-nor in 4.9 to spi-nor tree version (next branch) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are patches queued for 4.11. It adds support for even more hw and removes some annoying WARN_ONCE. Signed-off-by: Rafał Miłecki --- ...-mtd-spi-nor-improve-macronix_quad_enable.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 target/linux/generic/patches-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch (limited to 'target/linux/generic/patches-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch') diff --git a/target/linux/generic/patches-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch b/target/linux/generic/patches-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch new file mode 100644 index 0000000000..bdd5e344d7 --- /dev/null +++ b/target/linux/generic/patches-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch @@ -0,0 +1,28 @@ +From 1e99d0d51ec97bf48edd277658004ce030543d98 Mon Sep 17 00:00:00 2001 +From: Cyrille Pitchen +Date: Tue, 6 Dec 2016 17:01:41 +0100 +Subject: [PATCH] mtd: spi-nor: improve macronix_quad_enable() + +The patch checks whether the Quad Enable bit is already set in the Status +Register. If so, the function exits immediately with a successful return +code. + +Signed-off-by: Cyrille Pitchen +Reviewed-by: Jagan Teki +Acked-by: Marek Vasut +--- + drivers/mtd/spi-nor/spi-nor.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/mtd/spi-nor/spi-nor.c ++++ b/drivers/mtd/spi-nor/spi-nor.c +@@ -1305,6 +1305,9 @@ static int macronix_quad_enable(struct s + val = read_sr(nor); + if (val < 0) + return val; ++ if (val & SR_QUAD_EN_MX) ++ return 0; ++ + write_enable(nor); + + write_sr(nor, val | SR_QUAD_EN_MX); -- cgit v1.2.3