1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/spi/spi-armada-3700.c b/drivers/spi/spi-armada-3700.c
index 6c7d7a460689..a28702b1fa05 100644
--- a/drivers/spi/spi-armada-3700.c
+++ b/drivers/spi/spi-armada-3700.c
@@ -161,7 +161,7 @@ static void a3700_spi_deactivate_cs(struct a3700_spi *a3700_spi,
 }
 
 static int a3700_spi_pin_mode_set(struct a3700_spi *a3700_spi,
-                                  unsigned int pin_mode)
+                                  unsigned int pin_mode, bool receiving)
 {
         u32 val;
 
@@ -177,6 +177,9 @@ static int a3700_spi_pin_mode_set(struct a3700_spi *a3700_spi,
                 break;
         case SPI_NBITS_QUAD:
                 val |= A3700_SPI_DATA_PIN1;
+                /* RX during address reception uses 4-pin */
+                if (receiving)
+                        val |= A3700_SPI_ADDR_PIN;
                 break;
         default:
                 dev_err(&a3700_spi->master->dev, "wrong pin mode %u", pin_mode);
@@ -653,7 +656,7 @@ static int a3700_spi_transfer_one(struct spi_master *master,
         else if (xfer->rx_buf)
                 nbits = xfer->rx_nbits;
 
-        a3700_spi_pin_mode_set(a3700_spi, nbits);
+        a3700_spi_pin_mode_set(a3700_spi, nbits, xfer->rx_buf ? true : false);
 
         if (xfer->rx_buf) {
                 /* Set read data length */