mfd: lpc_ich: Do not touch SPI-NOR write protection bit on Apollo Lake

0f89ffef · Mika Westerberg <[email protected]> · 2018-01-04 12:20:18 +03:00

Just to be on the safe side, don't touch the bit. If write access to the
flash chip is needed, the BIOS needs to enable it explicitly.

Signed-off-by: Mika Westerberg <[email protected]>
Signed-off-by: Lee Jones <[email protected]>

Commit: 0f89ffefa4e122e7e9bc1c2d716c6052b4601b76
Parents: 0c384fc8

Changes

1 files changed · +0 −5

File	Status	Add	Del	Content
drivers/mfd/lpc_ich.c	modified	+0	−5	View file

drivers/mfd/lpc_ich.c

View file

diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
index cf1120a..53dc1a4 100644
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c
@@ -1143,11 +1143,6 @@ static int lpc_ich_init_spi(struct pci_dev *dev)
 			res->end = res->start + SPIBASE_APL_SZ - 1;
 
 			pci_bus_read_config_dword(bus, spi, BCR, &bcr);
-			if (!(bcr & BCR_WPD)) {
-				bcr |= BCR_WPD;
-				pci_bus_write_config_dword(bus, spi, BCR, bcr);
-				pci_bus_read_config_dword(bus, spi, BCR, &bcr);
-			}
 			info->writeable = !!(bcr & BCR_WPD);
 		}
 