Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f54645d1 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/topic/dt' into spi-next

parents 15751f2e cd6339e6

Documentation/devicetree/bindings/spi/spi-bus.txt

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ contain the following properties. 
    		chip select active high

- spi-3wire       - (optional) Empty property indicating device requires

    		    3-wire mode.

- spi-lsb-first   - (optional) Empty property indicating device requires

		LSB first mode.

- spi-tx-bus-width - (optional) The bus width(number of data wires) that

                      used for MOSI. Defaults to 1 if not present.

- spi-rx-bus-width - (optional) The bus width(number of data wires) that

drivers/spi/spi.c

+2 −0
Original line number Diff line number Diff line
@@ -1255,6 +1255,8 @@ static void of_register_spi_devices(struct spi_master *master) 
			spi->mode |= SPI_CS_HIGH;

		if (of_find_property(nc, "spi-3wire", NULL))

			spi->mode |= SPI_3WIRE;

		if (of_find_property(nc, "spi-lsb-first", NULL))

			spi->mode |= SPI_LSB_FIRST;



		/* Device DUAL/QUAD mode */

		if (!of_property_read_u32(nc, "spi-tx-bus-width", &value)) {