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

2 files changed, 4 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/spi/spi-bus.txt b/Documentation/devicetree/bindings/spi/spi-bus.txt
index e5a4d1b4acfe..22d57404fdc3 100644
--- a/Documentation/devicetree/bindings/spi/spi-bus.txt
+++ b/Documentation/devicetree/bindings/spi/spi-bus.txt
@@ -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
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index be13a35c6fec..d4f9670b51bc 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -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)) {