diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2017-02-07 13:09:50 +0100 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2017-02-07 15:35:39 +0100 |
commit | 174ce4c56d742712696e546eecee3d89e05c909a (patch) | |
tree | be0159e023e7ffe3c922ec183496768a0f2e4db9 /target/linux/generic/patches-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch | |
parent | 6d5419d96ad7d6f2b6de112e8f8ba1f74ceb33d3 (diff) | |
download | mtk-20170518-174ce4c56d742712696e546eecee3d89e05c909a.zip mtk-20170518-174ce4c56d742712696e546eecee3d89e05c909a.tar.gz mtk-20170518-174ce4c56d742712696e546eecee3d89e05c909a.tar.bz2 |
kernel: update spi-nor in 4.9 to spi-nor tree version (next branch)
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 <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch')
-rw-r--r-- | target/linux/generic/patches-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch | 28 |
1 files changed, 28 insertions, 0 deletions
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 0000000..bdd5e34 --- /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 <cyrille.pitchen@atmel.com> +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 <cyrille.pitchen@atmel.com> +Reviewed-by: Jagan Teki <jagan@openedev.com> +Acked-by: Marek Vasut <marek.vasut@gmail.com> +--- + 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); |