Unverified Commit b442990d authored by Mark Brown's avatar Mark Brown
Browse files

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.
parents 6b35b173 e0fe6a31

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

+2 −2
Original line number Diff line number Diff line
@@ -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:

drivers/spi/spi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}