aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2012-12-06 10:55:33 -0500
committerGrant Likely <grant.likely@secretlab.ca>2012-12-07 08:13:56 -0500
commitc20151dff8a6d503c0d0cc4387c33a618cdabcb7 (patch)
tree79eddf6e2d19950611613ce62d56db9a00e865fd
parent5323f49853ba5f37d9975fe6bd13546c2ec790c8 (diff)
spi: Add support for specifying 3-wire mode via device tree
This patch allows to specify that a SPI device is connected in 3-wire mode via device tree. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r--Documentation/devicetree/bindings/spi/spi-bus.txt2
-rw-r--r--drivers/spi/spi.c2
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 77a8b0d39b54..296015e3c632 100644
--- a/Documentation/devicetree/bindings/spi/spi-bus.txt
+++ b/Documentation/devicetree/bindings/spi/spi-bus.txt
@@ -53,6 +53,8 @@ contain the following properties.
53 shifted clock phase (CPHA) mode 53 shifted clock phase (CPHA) mode
54- spi-cs-high - (optional) Empty property indicating device requires 54- spi-cs-high - (optional) Empty property indicating device requires
55 chip select active high 55 chip select active high
56- spi-3wire - (optional) Empty property indicating device requires
57 3-wire mode.
56 58
57If a gpio chipselect is used for the SPI slave the gpio number will be passed 59If a gpio chipselect is used for the SPI slave the gpio number will be passed
58via the cs_gpio 60via the cs_gpio
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index b370d292d19c..2ca5f079ff01 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -861,6 +861,8 @@ static void of_register_spi_devices(struct spi_master *master)
861 spi->mode |= SPI_CPOL; 861 spi->mode |= SPI_CPOL;
862 if (of_find_property(nc, "spi-cs-high", NULL)) 862 if (of_find_property(nc, "spi-cs-high", NULL))
863 spi->mode |= SPI_CS_HIGH; 863 spi->mode |= SPI_CS_HIGH;
864 if (of_find_property(nc, "spi-3wire", NULL))
865 spi->mode |= SPI_3WIRE;
864 866
865 /* Device speed */ 867 /* Device speed */
866 prop = of_get_property(nc, "spi-max-frequency", &len); 868 prop = of_get_property(nc, "spi-max-frequency", &len);