mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-11-03 22:44:27 -05:00
174ce4c56d
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>
29 lines
892 B
Diff
29 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);
|