Merge branch 'spi-4.20' into spi-next

diff --cc drivers/spi/spi-gpio.c
index 421bfc7dda67413bd72ae96055c3767d01a33fa7,a2b08b464857fa7b527c9382a6a76eb1fe358ba1..45973ee3ae119e59a3b6846889b0449a7ba3e0d6
--- 1/drivers/spi/spi-gpio.c
--- 2/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",

diff --cc drivers/spi/spi-rockchip.c
Simple merge

diff --cc drivers/spi/spi-rspi.c
Simple merge

diff --cc drivers/spi/spi-sh-msiof.c
Simple merge

diff --cc drivers/spi/spi.c
Simple merge

diff --cc include/linux/pci.h
Simple merge