Unverified Commit e28ae34e authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 326e5c8d a4d8f64f

drivers/spi/spi-mt65xx.c

+2 −2
Original line number Diff line number Diff line
@@ -531,11 +531,11 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id) 
		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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE