From: Mark Brown <broonie@kernel.org>
Date: Sun, 21 Oct 2018 16:00:14 +0000 (+0100)
Subject: Merge branch 'spi-4.20' into spi-next
X-Git-Tag: v4.20-rc1~185^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4b51c747e4a52175e63d125db8365b38b06f0343;p=users%2Fwilly%2Flinux.git

Merge branch 'spi-4.20' into spi-next
---

4b51c747e4a52175e63d125db8365b38b06f0343
diff --cc drivers/spi/spi-gpio.c
index 421bfc7dda67,a2b08b464857..45973ee3ae11
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@@ -295,13 -295,15 +295,15 @@@ static int spi_gpio_request(struct devi
  	spi_gpio->miso = devm_gpiod_get_optional(dev, "miso", GPIOD_IN);
  	if (IS_ERR(spi_gpio->miso))
  		return PTR_ERR(spi_gpio->miso);
- 	if (!spi_gpio->miso)
- 		/* HW configuration without MISO pin */
- 		*mflags |= SPI_MASTER_NO_RX;
+ 	/*
+ 	 * No setting SPI_MASTER_NO_RX here - if there is only a MOSI
+ 	 * pin connected the host can still do RX by changing the
+ 	 * direction of the line.
+ 	 */
  
  	spi_gpio->sck = devm_gpiod_get(dev, "sck", GPIOD_OUT_LOW);
 -	if (IS_ERR(spi_gpio->mosi))
 -		return PTR_ERR(spi_gpio->mosi);
 +	if (IS_ERR(spi_gpio->sck))
 +		return PTR_ERR(spi_gpio->sck);
  
  	for (i = 0; i < num_chipselects; i++) {
  		spi_gpio->cs_gpios[i] = devm_gpiod_get_index(dev, "cs",