Commit f7038476 authored by Mark Brown's avatar Mark Brown

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.
parents 392af84b e0fe6a31
...@@ -44,9 +44,9 @@ properties: ...@@ -44,9 +44,9 @@ properties:
description: description:
Maximum SPI clocking speed of the device in Hz. Maximum SPI clocking speed of the device in Hz.
spi-cs-setup-ns: spi-cs-setup-delay-ns:
description: 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. asserted.
spi-rx-bus-width: spi-rx-bus-width:
......
...@@ -2310,7 +2310,7 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi, ...@@ -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)) if (!of_property_read_u32(nc, "spi-max-frequency", &value))
spi->max_speed_hz = 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.value = cs_setup;
spi->cs_setup.unit = SPI_DELAY_UNIT_NSECS; spi->cs_setup.unit = SPI_DELAY_UNIT_NSECS;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment