Skip to content

Commit b442990

Browse files
committed
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.
2 parents 6b35b17 + e0fe6a3 commit b442990

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ properties:
4444
description:
4545
Maximum SPI clocking speed of the device in Hz.
4646

47-
spi-cs-setup-ns:
47+
spi-cs-setup-delay-ns:
4848
description:
49-
Delay in nanosecods to be introduced by the controller after CS is
49+
Delay in nanoseconds to be introduced by the controller after CS is
5050
asserted.
5151

5252
spi-rx-bus-width:

drivers/spi/spi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2310,7 +2310,7 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
23102310
if (!of_property_read_u32(nc, "spi-max-frequency", &value))
23112311
spi->max_speed_hz = value;
23122312

2313-
if (!of_property_read_u16(nc, "spi-cs-setup-ns", &cs_setup)) {
2313+
if (!of_property_read_u16(nc, "spi-cs-setup-delay-ns", &cs_setup)) {
23142314
spi->cs_setup.value = cs_setup;
23152315
spi->cs_setup.unit = SPI_DELAY_UNIT_NSECS;
23162316
}

0 commit comments

Comments
 (0)