diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-02 17:08:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-02 17:08:35 +0100 |
| commit | f54645d1aac092d5b3065b1d1fe181dff4deb71d (patch) | |
| tree | 8b37604dd1a79dcbd5d9220304b1cf9ab04d3a5e | |
| parent | 15751f2e717c4cbdf17b0c21f2b1b23a939dafc9 (diff) | |
| parent | cd6339e6ced387ad67b5551dd2931cfd7e8b970b (diff) | |
| download | linux-f54645d1aac092d5b3065b1d1fe181dff4deb71d.tar.bz2 | |
Merge remote-tracking branch 'spi/topic/dt' into spi-next
| -rw-r--r-- | Documentation/devicetree/bindings/spi/spi-bus.txt | 2 | ||||
| -rw-r--r-- | drivers/spi/spi.c | 2 |
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)) { |