* [PATCH resend] spi: Add support for specifying 3-wire mode via device tree
@ 2012-12-06 15:55 Lars-Peter Clausen
[not found] ` <1354809333-18364-1-git-send-email-lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Lars-Peter Clausen @ 2012-12-06 15:55 UTC (permalink / raw)
To: Grant Likely
Cc: Rob Herring, devicetree-discuss, spi-devel-general, linux-kernel,
Lars-Peter Clausen
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>
---
Documentation/devicetree/bindings/spi/spi-bus.txt | 2 ++
drivers/spi/spi.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/spi/spi-bus.txt b/Documentation/devicetree/bindings/spi/spi-bus.txt
index 77a8b0d..296015e 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.
shifted clock phase (CPHA) mode
- spi-cs-high - (optional) Empty property indicating device requires
chip select active high
+- spi-3wire - (optional) Empty property indicating device requires
+ 3-wire mode.
If a gpio chipselect is used for the SPI slave the gpio number will be passed
via the cs_gpio
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 22c71e2..cb61ada 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)
spi->mode |= SPI_CPOL;
if (of_find_property(nc, "spi-cs-high", NULL))
spi->mode |= SPI_CS_HIGH;
+ if (of_find_property(nc, "spi-3wire", NULL))
+ spi->mode |= SPI_3WIRE;
/* Device speed */
prop = of_get_property(nc, "spi-max-frequency", &len);
--
1.8.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH resend] spi: Add support for specifying 3-wire mode via device tree
[not found] ` <1354809333-18364-1-git-send-email-lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>
@ 2012-12-07 13:14 ` Grant Likely
0 siblings, 0 replies; 2+ messages in thread
From: Grant Likely @ 2012-12-07 13:14 UTC (permalink / raw)
To: Lars-Peter Clausen
Cc: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, Lars-Peter Clausen,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Rob Herring
On Thu, 6 Dec 2012 16:55:33 +0100, Lars-Peter Clausen <lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org> wrote:
> 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-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>
> Acked-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
Applied, thanks.
g.
> ---
> Documentation/devicetree/bindings/spi/spi-bus.txt | 2 ++
> drivers/spi/spi.c | 2 ++
> 2 files changed, 4 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/spi/spi-bus.txt b/Documentation/devicetree/bindings/spi/spi-bus.txt
> index 77a8b0d..296015e 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.
> shifted clock phase (CPHA) mode
> - spi-cs-high - (optional) Empty property indicating device requires
> chip select active high
> +- spi-3wire - (optional) Empty property indicating device requires
> + 3-wire mode.
>
> If a gpio chipselect is used for the SPI slave the gpio number will be passed
> via the cs_gpio
> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
> index 22c71e2..cb61ada 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)
> spi->mode |= SPI_CPOL;
> if (of_find_property(nc, "spi-cs-high", NULL))
> spi->mode |= SPI_CS_HIGH;
> + if (of_find_property(nc, "spi-3wire", NULL))
> + spi->mode |= SPI_3WIRE;
>
> /* Device speed */
> prop = of_get_property(nc, "spi-max-frequency", &len);
> --
> 1.8.0
>
--
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-07 13:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-06 15:55 [PATCH resend] spi: Add support for specifying 3-wire mode via device tree Lars-Peter Clausen
[not found] ` <1354809333-18364-1-git-send-email-lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>
2012-12-07 13:14 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).