| From 7b2a9d03cec9114e3eb9d0740915d9324e9ea82f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 24 Aug 2021 11:25:56 +0200 |
| Subject: spi: davinci: invoke chipselect callback |
| |
| From: Matija Glavinic Pecotic <matija.glavinic-pecotic.ext@nokia.com> |
| |
| [ Upstream commit ea4ab99cb58cc9f8d64c0961ff9a059825f304cf ] |
| |
| Davinci needs to configure chipselect on transfer. |
| |
| Fixes: 4a07b8bcd503 ("spi: bitbang: Make chipselect callback optional") |
| Signed-off-by: Matija Glavinic Pecotic <matija.glavinic-pecotic.ext@nokia.com> |
| Reviewed-by: Alexander Sverdlin <alexander.sverdlin@nokia.com> |
| Link: https://lore.kernel.org/r/735fb7b0-82aa-5b9b-85e4-53f0c348cc0e@nokia.com |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/spi/spi-davinci.c | 8 +------- |
| 1 file changed, 1 insertion(+), 7 deletions(-) |
| |
| diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c |
| index 7453a1dbbc06..fda73221f3b7 100644 |
| --- a/drivers/spi/spi-davinci.c |
| +++ b/drivers/spi/spi-davinci.c |
| @@ -213,12 +213,6 @@ static void davinci_spi_chipselect(struct spi_device *spi, int value) |
| * line for the controller |
| */ |
| if (spi->cs_gpiod) { |
| - /* |
| - * FIXME: is this code ever executed? This host does not |
| - * set SPI_MASTER_GPIO_SS so this chipselect callback should |
| - * not get called from the SPI core when we are using |
| - * GPIOs for chip select. |
| - */ |
| if (value == BITBANG_CS_ACTIVE) |
| gpiod_set_value(spi->cs_gpiod, 1); |
| else |
| @@ -950,7 +944,7 @@ static int davinci_spi_probe(struct platform_device *pdev) |
| master->bus_num = pdev->id; |
| master->num_chipselect = pdata->num_chipselect; |
| master->bits_per_word_mask = SPI_BPW_RANGE_MASK(2, 16); |
| - master->flags = SPI_MASTER_MUST_RX; |
| + master->flags = SPI_MASTER_MUST_RX | SPI_MASTER_GPIO_SS; |
| master->setup = davinci_spi_setup; |
| master->cleanup = davinci_spi_cleanup; |
| master->can_dma = davinci_spi_can_dma; |
| -- |
| 2.30.2 |
| |
