summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2018-04-15 11:33:08 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-01 12:58:24 -0700
commit9922fd0c681f4755422900c529290d393229d38d (patch)
treee1dc8c999802199669f599310c3225186e821ace
parent7563d6f2be58010edecd145faa06bcd82251caa0 (diff)
downloadlinux-stable-9922fd0c681f4755422900c529290d393229d38d.tar.gz
linux-stable-9922fd0c681f4755422900c529290d393229d38d.tar.bz2
linux-stable-9922fd0c681f4755422900c529290d393229d38d.zip
fpga-manager: altera-ps-spi: preserve nCONFIG state
commit 881c93c0fb73328845898344208fa0bf0d62cac6 upstream. If the driver module is loaded when FPGA is configured, the FPGA is reset because nconfig is pulled low (low-active gpio inited with GPIOD_OUT_HIGH activates the signal which means setting its value to low). Init nconfig with GPIOD_OUT_LOW to prevent this. Signed-off-by: Anatolij Gustschin <agust@denx.de> Acked-by: Alan Tull <atull@kernel.org> Signed-off-by: Moritz Fischer <mdf@kernel.org> Cc: stable <stable@vger.kernel.org> # 4.14+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/fpga/altera-ps-spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/fpga/altera-ps-spi.c b/drivers/fpga/altera-ps-spi.c
index 14f14efdf0d5..06d212a3d49d 100644
--- a/drivers/fpga/altera-ps-spi.c
+++ b/drivers/fpga/altera-ps-spi.c
@@ -249,7 +249,7 @@ static int altera_ps_probe(struct spi_device *spi)
conf->data = of_id->data;
conf->spi = spi;
- conf->config = devm_gpiod_get(&spi->dev, "nconfig", GPIOD_OUT_HIGH);
+ conf->config = devm_gpiod_get(&spi->dev, "nconfig", GPIOD_OUT_LOW);
if (IS_ERR(conf->config)) {
dev_err(&spi->dev, "Failed to get config gpio: %ld\n",
PTR_ERR(conf->config));