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

Unverified Commit 673c865e authored by Vignesh R's avatar Vignesh R Committed by Mark Brown
Browse files

spi: ti-qspi: Fix mmap read when more than one CS in use 



Commit 4dea6c9b ("spi: spi-ti-qspi: add mmap mode read support") has
has got order of parameter wrong when calling regmap_update_bits() to
select CS for mmap access. Mask and value arguments are interchanged.
Code will work on a system with single slave, but fails when more than
one CS is in use. Fix this by correcting the order of parameters when
calling regmap_update_bits().

Fixes: 4dea6c9b ("spi: spi-ti-qspi: add mmap mode read support")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarVignesh R <vigneshr@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e902cdcb

drivers/spi/spi-ti-qspi.c

+3 −3
Original line number Diff line number Diff line
@@ -490,8 +490,8 @@ static void ti_qspi_enable_memory_map(struct spi_device *spi) 
	ti_qspi_write(qspi, MM_SWITCH, QSPI_SPI_SWITCH_REG);

	if (qspi->ctrl_base) {

		regmap_update_bits(qspi->ctrl_base, qspi->ctrl_reg,

				   MEM_CS_EN(spi->chip_select),

				   MEM_CS_MASK);

				   MEM_CS_MASK,

				   MEM_CS_EN(spi->chip_select));

	}

	qspi->mmap_enabled = true;

}
@@ -503,7 +503,7 @@ static void ti_qspi_disable_memory_map(struct spi_device *spi) 
	ti_qspi_write(qspi, 0, QSPI_SPI_SWITCH_REG);

	if (qspi->ctrl_base)

		regmap_update_bits(qspi->ctrl_base, qspi->ctrl_reg,

				   0, MEM_CS_MASK);

				   MEM_CS_MASK, 0);

	qspi->mmap_enabled = false;

}