Commit f710d111 authored by Dan Sneddon's avatar Dan Sneddon Committed by sanglipeng
Browse files

spi: atmel: Fix CS and initialization bug 

stable inclusion
from stable-v5.10.206
commit 929f475ebaf09d2e4e40bdc6fc3902cca150974f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9O5W8

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=929f475ebaf09d2e4e40bdc6fc3902cca150974f



--------------------------------

[ Upstream commit 69e1818a ]

Commit 5fa5e6de ("spi: atmel: Switch to transfer_one transfer
method") switched to using transfer_one and set_cs.  The
core doesn't call set_cs when the chip select lines are gpios.  Add the
SPI_MASTER_GPIO_SS flag to the driver to ensure the calls to set_cs
happen since the driver programs configuration registers there.

Fixes: 5fa5e6de ("spi: atmel: Switch to transfer_one transfer method")

Signed-off-by: default avatarDan Sneddon <dan.sneddon@microchip.com>
Link: https://lore.kernel.org/r/20210629192218.32125-1-dan.sneddon@microchip.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Stable-dep-of: fc70d643a2f6 ("spi: atmel: Fix clock issue when using devices with different polarities")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent a0ed9c65

drivers/spi/spi-atmel.c

+2 −7
Original line number Diff line number Diff line
@@ -352,8 +352,6 @@ static void cs_activate(struct atmel_spi *as, struct spi_device *spi) 
		}



		mr = spi_readl(as, MR);

		if (spi->cs_gpiod)

			gpiod_set_value(spi->cs_gpiod, 1);

	} else {

		u32 cpol = (spi->mode & SPI_CPOL) ? SPI_BIT(CPOL) : 0;

		int i;
@@ -369,8 +367,6 @@ static void cs_activate(struct atmel_spi *as, struct spi_device *spi) 


		mr = spi_readl(as, MR);

		mr = SPI_BFINS(PCS, ~(1 << chip_select), mr);

		if (spi->cs_gpiod)

			gpiod_set_value(spi->cs_gpiod, 1);

		spi_writel(as, MR, mr);

	}
@@ -400,8 +396,6 @@ static void cs_deactivate(struct atmel_spi *as, struct spi_device *spi) 


	if (!spi->cs_gpiod)

		spi_writel(as, CR, SPI_BIT(LASTXFER));

	else

		gpiod_set_value(spi->cs_gpiod, 0);

}



static void atmel_spi_lock(struct atmel_spi *as) __acquires(&as->lock)
@@ -1498,7 +1492,8 @@ static int atmel_spi_probe(struct platform_device *pdev) 
	master->bus_num = pdev->id;

	master->num_chipselect = 4;

	master->setup = atmel_spi_setup;

	master->flags = (SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX);

	master->flags = (SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX |

			SPI_MASTER_GPIO_SS);

	master->transfer_one = atmel_spi_one_transfer;

	master->set_cs = atmel_spi_set_cs;

	master->cleanup = atmel_spi_cleanup;