74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
28 lines
892 B
Diff
28 lines
892 B
Diff
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);
|