diff options
| author | Mason Zhang <[email protected]> | 2021-08-04 13:37:17 +0000 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2021-08-05 15:42:53 +0000 |
| commit | 8c33ebfeeb597ea953df93f84ea25482d29c664f (patch) | |
| tree | 52a864dc68259fac9c661324eb2faabdbe5ef3f7 /drivers/spi/spi.c | |
| parent | Merge series "arm: ep93xx: CCF conversion" from Nikita Shubin <nikita.shubin@... (diff) | |
| download | kernel-8c33ebfeeb597ea953df93f84ea25482d29c664f.tar.gz kernel-8c33ebfeeb597ea953df93f84ea25482d29c664f.zip | |
spi: move cs spi_delay to spi_device
As we know, spi core layer has removed spi_set_cs_timing() API.
So this patch moved spi_delay for cs_timing from spi_controller
to spi_device, because cs timing should be set by spi_device but
not controller.
Signed-off-by: Mason Zhang <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index c99181165321..5d68e6cd2a18 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -842,9 +842,9 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force) if (spi->cs_gpiod || gpio_is_valid(spi->cs_gpio) || !spi->controller->set_cs_timing) { if (activate) - spi_delay_exec(&spi->controller->cs_setup, NULL); + spi_delay_exec(&spi->cs_setup, NULL); else - spi_delay_exec(&spi->controller->cs_hold, NULL); + spi_delay_exec(&spi->cs_hold, NULL); } if (spi->mode & SPI_CS_HIGH) @@ -887,7 +887,7 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force) if (spi->cs_gpiod || gpio_is_valid(spi->cs_gpio) || !spi->controller->set_cs_timing) { if (!activate) - spi_delay_exec(&spi->controller->cs_inactive, NULL); + spi_delay_exec(&spi->cs_inactive, NULL); } } |