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

		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,