Merge remote-tracking branches 'spi/fix/dspi' and 'spi/fix/spidev' into spi-linus (c1f4a149) · Commits · 戴 / test

drivers/spi/spi-fsl-dspi.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -167,7 +167,7 @@ static inline int is_double_byte_mode(struct fsl_dspi *dspi)
		{
		unsigned int val;

		regmap_read(dspi->regmap, SPI_CTAR(dspi->cs), &val);
		regmap_read(dspi->regmap, SPI_CTAR(0), &val);

		return ((val & SPI_FRAME_BITS_MASK) == SPI_FRAME_BITS(8)) ? 0 : 1;
		}
		@@ -257,7 +257,7 @@ static u32 dspi_data_to_pushr(struct fsl_dspi *dspi, int tx_word)

		return SPI_PUSHR_TXDATA(d16) \|
		SPI_PUSHR_PCS(dspi->cs) \|
		SPI_PUSHR_CTAS(dspi->cs) \|
		SPI_PUSHR_CTAS(0) \|
		SPI_PUSHR_CONT;
		}

		@@ -290,7 +290,7 @@ static int dspi_eoq_write(struct fsl_dspi *dspi)
		*/
		if (tx_word && (dspi->len == 1)) {
		dspi->dataflags \|= TRAN_STATE_WORD_ODD_NUM;
		regmap_update_bits(dspi->regmap, SPI_CTAR(dspi->cs),
		regmap_update_bits(dspi->regmap, SPI_CTAR(0),
		SPI_FRAME_BITS_MASK, SPI_FRAME_BITS(8));
		tx_word = 0;
		}
		@@ -339,7 +339,7 @@ static int dspi_tcfq_write(struct fsl_dspi *dspi)

		if (tx_word && (dspi->len == 1)) {
		dspi->dataflags \|= TRAN_STATE_WORD_ODD_NUM;
		regmap_update_bits(dspi->regmap, SPI_CTAR(dspi->cs),
		regmap_update_bits(dspi->regmap, SPI_CTAR(0),
		SPI_FRAME_BITS_MASK, SPI_FRAME_BITS(8));
		tx_word = 0;
		}
		@@ -407,7 +407,7 @@ static int dspi_transfer_one_message(struct spi_master *master,
		regmap_update_bits(dspi->regmap, SPI_MCR,
		SPI_MCR_CLR_TXF \| SPI_MCR_CLR_RXF,
		SPI_MCR_CLR_TXF \| SPI_MCR_CLR_RXF);
		regmap_write(dspi->regmap, SPI_CTAR(dspi->cs),
		regmap_write(dspi->regmap, SPI_CTAR(0),
		dspi->cur_chip->ctar_val);

		trans_mode = dspi->devtype_data->trans_mode;
		@@ -566,7 +566,7 @@ static irqreturn_t dspi_interrupt(int irq, void *dev_id)
		if (!dspi->len) {
		if (dspi->dataflags & TRAN_STATE_WORD_ODD_NUM) {
		regmap_update_bits(dspi->regmap,
		SPI_CTAR(dspi->cs),
		SPI_CTAR(0),
		SPI_FRAME_BITS_MASK,
		SPI_FRAME_BITS(16));
		dspi->dataflags &= ~TRAN_STATE_WORD_ODD_NUM;

drivers/spi/spidev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -651,11 +651,11 @@ static int spidev_release(struct inode inode, struct file filp)
		kfree(spidev->rx_buffer);
		spidev->rx_buffer = NULL;

		spin_lock_irq(&spidev->spi_lock);
		if (spidev->spi)
		spidev->speed_hz = spidev->spi->max_speed_hz;

		/* ... after we unbound from the underlying device? */
		spin_lock_irq(&spidev->spi_lock);
		dofree = (spidev->spi == NULL);
		spin_unlock_irq(&spidev->spi_lock);

Admin message