Merge tag 'spi-fix-v4.19-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi (3918c21e) · Commits · 戴 / test

drivers/spi/spi-fsl-dspi.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -30,7 +30,11 @@

		#define DRIVER_NAME "fsl-dspi"

		#ifdef CONFIG_M5441x
		#define DSPI_FIFO_SIZE 16
		#else
		#define DSPI_FIFO_SIZE 4
		#endif
		#define DSPI_DMA_BUFSIZE (DSPI_FIFO_SIZE * 1024)

		#define SPI_MCR 0x00
		@@ -623,9 +627,11 @@ static void dspi_tcfq_read(struct fsl_dspi *dspi)
		static void dspi_eoq_write(struct fsl_dspi *dspi)
		{
		int fifo_size = DSPI_FIFO_SIZE;
		u16 xfer_cmd = dspi->tx_cmd;

		/* Fill TX FIFO with as many transfers as possible */
		while (dspi->len && fifo_size--) {
		dspi->tx_cmd = xfer_cmd;
		/* Request EOQF for last transfer in FIFO */
		if (dspi->len == dspi->bytes_per_word \|\| fifo_size == 0)
		dspi->tx_cmd \|= SPI_PUSHR_CMD_EOQ;

+11 −2

Original line number	Diff line number	Diff line
		@@ -2143,8 +2143,17 @@ int spi_register_controller(struct spi_controller *ctlr)
		*/
		if (ctlr->num_chipselect == 0)
		return -EINVAL;
		if (ctlr->bus_num >= 0) {
		/* devices with a fixed bus num must check-in with the num */
		mutex_lock(&board_lock);
		id = idr_alloc(&spi_master_idr, ctlr, ctlr->bus_num,
		ctlr->bus_num + 1, GFP_KERNEL);
		mutex_unlock(&board_lock);
		if (WARN(id < 0, "couldn't get idr"))
		return id == -ENOSPC ? -EBUSY : id;
		ctlr->bus_num = id;
		} else if (ctlr->dev.of_node) {
		/* allocate dynamic bus number using Linux idr */
		if ((ctlr->bus_num < 0) && ctlr->dev.of_node) {
		id = of_alias_get_id(ctlr->dev.of_node, "spi");
		if (id >= 0) {
		ctlr->bus_num = id;