diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-02 12:08:35 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-02 12:08:35 -0400 |
| commit | f54645d1aac092d5b3065b1d1fe181dff4deb71d (patch) | |
| tree | 8b37604dd1a79dcbd5d9220304b1cf9ab04d3a5e /drivers/spi/spi.c | |
| parent | 15751f2e717c4cbdf17b0c21f2b1b23a939dafc9 (diff) | |
| parent | cd6339e6ced387ad67b5551dd2931cfd7e8b970b (diff) | |
Merge remote-tracking branch 'spi/topic/dt' into spi-next
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) | |||
| 1255 | spi->mode |= SPI_CS_HIGH; | 1255 | spi->mode |= SPI_CS_HIGH; |
| 1256 | if (of_find_property(nc, "spi-3wire", NULL)) | 1256 | if (of_find_property(nc, "spi-3wire", NULL)) |
| 1257 | spi->mode |= SPI_3WIRE; | 1257 | spi->mode |= SPI_3WIRE; |
| 1258 | if (of_find_property(nc, "spi-lsb-first", NULL)) | ||
| 1259 | spi->mode |= SPI_LSB_FIRST; | ||
| 1258 | 1260 | ||
| 1259 | /* Device DUAL/QUAD mode */ | 1261 | /* Device DUAL/QUAD mode */ |
| 1260 | if (!of_property_read_u32(nc, "spi-tx-bus-width", &value)) { | 1262 | if (!of_property_read_u32(nc, "spi-tx-bus-width", &value)) { |