diff options
| author | Mark Brown <broonie@kernel.org> | 2023-01-11 17:15:22 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-01-11 17:15:22 +0300 |
| commit | b442990d244ba2ffe926c6603c42deb6fcc3b0db (patch) | |
| tree | 3ddd71cdf6d03700f0eea989654f3d0d871f6290 | |
| parent | 6b35b173dbc1711f8d272e3f322d2ad697015919 (diff) | |
| parent | e0fe6a31cac84735939c29d1e05055d58325c6c0 (diff) | |
| download | linux-b442990d244ba2ffe926c6603c42deb6fcc3b0db.tar.xz | |
spi: Merge rename of spi-cs-setup-ns DT property
The newly added spi-cs-setup-ns doesn't really fit with the existing
property names for delays, rename it so that it does before it makes it
into a release and becomes ABI.
| -rw-r--r-- | Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml | 4 | ||||
| -rw-r--r-- | drivers/spi/spi.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml b/Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml index ead2cccf658f..9a60c0664bbe 100644 --- a/Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml +++ b/Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml @@ -44,9 +44,9 @@ properties: description: Maximum SPI clocking speed of the device in Hz. - spi-cs-setup-ns: + spi-cs-setup-delay-ns: description: - Delay in nanosecods to be introduced by the controller after CS is + Delay in nanoseconds to be introduced by the controller after CS is asserted. spi-rx-bus-width: 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; } |