From: Bin Meng <bmeng.cn@gmail.com>
Date: Sun, 27 Aug 2017 02:22:59 +0000 (-0700)
Subject: x86: ich-spi: Clear atomic preop only when SPI settings are not locked
X-Git-Tag: v2017.09-rc4~27^2~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d2ca80c3d7e314c2dd2ac1bf63e5630ae7131a57;p=u-boot

x86: ich-spi: Clear atomic preop only when SPI settings are not locked

The atomic preop register can only be written when SPI settings are
not locked, otherwise it's read-only.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
---

diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index 5a3d690815..22fc83dd72 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -563,7 +563,8 @@ static int ich_spi_xfer(struct udevice *dev, unsigned int bitlen,
 	}
 
 	/* Clear atomic preop now that xfer is done */
-	ich_writew(ctlr, 0, ctlr->preop);
+	if (!lock)
+		ich_writew(ctlr, 0, ctlr->preop);
 
 	return 0;
 }