Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit e1bc2048 authored by shaftarger's avatar shaftarger Committed by Mark Brown
Browse files

spi: dw: fix potential variable assignment error 



spi::mode is defined by framework for several SPI capabilities,
such as polarity, phase, bit-endian, wire number. Directly use this
variable for setting controller's polarity and phase causes other
bit in register being set. Since SPI framework has its definition,
SPI_CPOL and SPI_CPHA offset may be changed by framwork change.
Instead of just mask off the relevant bits,
fetch required bit in spi::mode and set to register.

Signed-off-by: default avatarshaftarger <shol@livemail.tw>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0dcdcd0e

drivers/spi/spi-dw.c

+2 −1
Original line number Diff line number Diff line
@@ -317,7 +317,8 @@ static int dw_spi_transfer_one(struct spi_controller *master, 
	/* Default SPI mode is SCPOL = 0, SCPH = 0 */

	cr0 = (transfer->bits_per_word - 1)

		| (chip->type << SPI_FRF_OFFSET)

		| (spi->mode << SPI_MODE_OFFSET)

		| ((((spi->mode & SPI_CPOL) ? 1 : 0) << SPI_SCOL_OFFSET) |

			(((spi->mode & SPI_CPHA) ? 1 : 0) << SPI_SCPH_OFFSET))

		| (chip->tmode << SPI_TMOD_OFFSET);



	/*