diff options
author | Mark Brown <broonie@kernel.org> | 2023-01-06 19:31:35 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2023-01-06 19:31:35 +0300 |
commit | 819cfea7d69d5561f89c4957ff94afc6cad76356 (patch) | |
tree | 3561060269054ff1f5c50f13be24a89697b9b194 /drivers | |
parent | e8bb8f19e73a1e855e54788f8673b9b49e46b5cd (diff) | |
parent | e0fe6a31cac84735939c29d1e05055d58325c6c0 (diff) | |
download | linux-819cfea7d69d5561f89c4957ff94afc6cad76356.tar.xz |
spi: SPI core CS delay property rename
From: Hector Martin <marcan@marcan.st>
Date: Wed, 04 Jan 2023 18:36:26 +0900
Message-Id: <20230104093631.15611-1-marcan@marcan.st>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Merge changes 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')
-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; } |