Merge branch 'spi-4.20' into spi-4.21 for uniphier DT

diff --combined drivers/spi/spi-mt65xx.c
index f3119d82150eb43e32f4b0eadfdfe26aacca6c4b,0c2867deb36fce48c74b92388d210371ebd1a6d0..9ee1fe968a2dd92d294b9aac36092490ea8532d6
--- 1/drivers/spi/spi-mt65xx.c
--- 2/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@@ -120,12 -120,6 +120,12 @@@ static const struct mtk_spi_compatible 
        .must_tx = true,
  };
  
 +static const struct mtk_spi_compatible mt8183_compat = {
 +      .need_pad_sel = true,
 +      .must_tx = true,
 +      .enhance_timing = true,
 +};
 +
  /*
   * A piece of default chip info unless the platform
   * supplies it.
@@@ -156,9 -150,6 +156,9 @@@ static const struct of_device_id mtk_sp
        { .compatible = "mediatek,mt8173-spi",
                .data = (void *)&mt8173_compat,
        },
 +      { .compatible = "mediatek,mt8183-spi",
 +              .data = (void *)&mt8183_compat,
 +      },
        {}
  };
  MODULE_DEVICE_TABLE(of, mtk_spi_of_match);
@@@ -531,11 -522,11 +531,11 @@@ static irqreturn_t mtk_spi_interrupt(in
                mdata->xfer_len = min(MTK_SPI_MAX_FIFO_SIZE, len);
                mtk_spi_setup_packet(master);
  
-               cnt = len / 4;
+               cnt = mdata->xfer_len / 4;
                iowrite32_rep(mdata->base + SPI_TX_DATA_REG,
                                trans->tx_buf + mdata->num_xfered, cnt);
  
-               remainder = len % 4;
+               remainder = mdata->xfer_len % 4;
                if (remainder > 0) {
                        reg_val = 0;
                        memcpy(&reg_val,