Skip to content

Commit

Permalink
spi: SPI core CS delay property rename
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Mark Brown committed Jan 6, 2023
2 parents e8bb8f1 + e0fe6a3 commit 819cfea
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion drivers/spi/spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 819cfea

Please sign in to comment.