diff options
| author | Mark Brown <broonie@kernel.org> | 2023-01-06 18:26:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-01-06 18:26:02 +0100 |
| commit | f7038476a12ce6c463f9e777d426a657c6debfd8 (patch) | |
| tree | 6942f1fdfaf0ac055f609ef8499ae24ac6aff958 /drivers/spi | |
| parent | spi: spi-loopback-test: Allow skipping delays (diff) | |
| parent | spi: Rename spi-cs-setup-ns property to spi-cs-setup-delay-ns (diff) | |
| download | linux-f7038476a12ce6c463f9e777d426a657c6debfd8.tar.xz linux-f7038476a12ce6c463f9e777d426a657c6debfd8.zip | |
SPI core CS delay fixes and additions
Merge series from Hector Martin <marcan@marcan.st>:
This brings the name of the cs-setup-ns parameter which was added during
the merge window into line with other delay properties.
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 3cc7bb4d03de..15f174f4e056 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2310,7 +2310,7 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi, if (!of_property_read_u32(nc, "spi-max-frequency", &value)) spi->max_speed_hz = value; - if (!of_property_read_u16(nc, "spi-cs-setup-ns", &cs_setup)) { + if (!of_property_read_u16(nc, "spi-cs-setup-delay-ns", &cs_setup)) { spi->cs_setup.value = cs_setup; spi->cs_setup.unit = SPI_DELAY_UNIT_NSECS; } |