From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030286Ab2LGNOM (ORCPT ); Fri, 7 Dec 2012 08:14:12 -0500 Received: from mail-wg0-f46.google.com ([74.125.82.46]:60986 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030216Ab2LGNOL (ORCPT ); Fri, 7 Dec 2012 08:14:11 -0500 From: Grant Likely Subject: Re: [PATCH resend] spi: Add support for specifying 3-wire mode via device tree To: Lars-Peter Clausen Cc: Rob Herring , devicetree-discuss@lists.ozlabs.org, spi-devel-general@lists.sourceforge.net, linux-kernel@vger.kernel.org, Lars-Peter Clausen In-Reply-To: <1354809333-18364-1-git-send-email-lars@metafoo.de> References: <1354809333-18364-1-git-send-email-lars@metafoo.de> Date: Fri, 07 Dec 2012 13:14:05 +0000 Message-Id: <20121207131405.EBFDE3E0B87@localhost> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 6 Dec 2012 16:55:33 +0100, Lars-Peter Clausen 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 > Acked-by: Rob Herring 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.