diff mbox series

[1/2] spi: support inter-word delay requirement for devices

Message ID 20190125114429.20066-2-jonas@norrbonn.se (mailing list archive)
State Superseded
Headers show
Series spi: support inter-word delays | expand

Commit Message

Jonas Bonn Jan. 25, 2019, 11:44 a.m. UTC
Some devices are slow and cannot keep up with the SPI bus and therefore
require a short delay between words of the SPI transfer.

The example of this that I'm looking at is a SAMA5D2 with a minimum SPI
clock of 400kHz talking to an AVR-based SPI slave.  The AVR cannot put
bytes on the bus fast enough to keep up with the SoC's SPI controller
even at the lowest bus speed.

This patch introduces the ability to specify a required inter-word
delay for SPI devices.  It is up to the controller driver to configure
itself accordingly in order to introduce the requested delay.

Signed-off-by: Jonas Bonn <jonas@norrbonn.se>
CC: Mark Brown <broonie@kernel.org>
CC: Rob Herring <robh+dt@kernel.org>
CC: Mark Rutland <mark.rutland@arm.com>
CC: linux-spi@vger.kernel.org
CC: devicetree@vger.kernel.org
---
 Documentation/devicetree/bindings/spi/spi-bus.txt | 1 +
 drivers/spi/spi.c                                 | 4 ++++
 include/linux/spi/spi.h                           | 1 +
 3 files changed, 6 insertions(+)

Comments

(Exiting) Baolin Wang Jan. 25, 2019, 11:53 a.m. UTC | #1
Hi,
On Fri, 25 Jan 2019 at 19:44, Jonas Bonn <jonas@norrbonn.se> wrote:
>
> Some devices are slow and cannot keep up with the SPI bus and therefore
> require a short delay between words of the SPI transfer.
>
> The example of this that I'm looking at is a SAMA5D2 with a minimum SPI
> clock of 400kHz talking to an AVR-based SPI slave.  The AVR cannot put
> bytes on the bus fast enough to keep up with the SoC's SPI controller
> even at the lowest bus speed.
>
> This patch introduces the ability to specify a required inter-word
> delay for SPI devices.  It is up to the controller driver to configure
> itself accordingly in order to introduce the requested delay.

Can we configure it at runtime by the device rather than at DT time by
the controller? If yes, we already have a patch for this, please
check:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeaceb8b7d1fb64b6030249ca0dd1d902ef3069e

>
> Signed-off-by: Jonas Bonn <jonas@norrbonn.se>
> CC: Mark Brown <broonie@kernel.org>
> CC: Rob Herring <robh+dt@kernel.org>
> CC: Mark Rutland <mark.rutland@arm.com>
> CC: linux-spi@vger.kernel.org
> CC: devicetree@vger.kernel.org
> ---
>  Documentation/devicetree/bindings/spi/spi-bus.txt | 1 +
>  drivers/spi/spi.c                                 | 4 ++++
>  include/linux/spi/spi.h                           | 1 +
>  3 files changed, 6 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/spi/spi-bus.txt b/Documentation/devicetree/bindings/spi/spi-bus.txt
> index 1f6e86f787ef..a5f20060676d 100644
> --- a/Documentation/devicetree/bindings/spi/spi-bus.txt
> +++ b/Documentation/devicetree/bindings/spi/spi-bus.txt
> @@ -77,6 +77,7 @@ All slave nodes can contain the following optional properties:
>                     Defaults to 1 if not present.
>  - spi-rx-delay-us - Microsecond delay after a read transfer.
>  - spi-tx-delay-us - Microsecond delay after a write transfer.
> +- spi-word-delay-us - Microsecond delay between individual words of a transfer
>
>  Some SPI controllers and devices support Dual and Quad SPI transfer mode.
>  It allows data in the SPI system to be transferred using 2 wires (DUAL) or 4
> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
> index 9a7def7c3237..cd4d4065eca2 100644
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@ -1692,6 +1692,10 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
>         }
>         spi->max_speed_hz = value;
>
> +       if (!of_property_read_u32(nc, "spi-word-delay-us", &value)) {
> +               spi->word_delay = value;
> +       }
> +
>         return 0;
>  }
>
> diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
> index 314d922ca607..e5200dd9d750 100644
> --- a/include/linux/spi/spi.h
> +++ b/include/linux/spi/spi.h
> @@ -164,6 +164,7 @@ struct spi_device {
>         char                    modalias[SPI_NAME_SIZE];
>         const char              *driver_override;
>         int                     cs_gpio;        /* chip select gpio */
> +       uint16_t                word_delay;     /* inter-word delay (us) */
>
>         /* the statistics */
>         struct spi_statistics   statistics;
> --
> 2.19.1
>
Jonas Bonn Jan. 25, 2019, 12:06 p.m. UTC | #2
Hi,

On 25/01/2019 12:53, Baolin Wang wrote:
> Hi,
> On Fri, 25 Jan 2019 at 19:44, Jonas Bonn <jonas@norrbonn.se> wrote:
>>
>> Some devices are slow and cannot keep up with the SPI bus and therefore
>> require a short delay between words of the SPI transfer.
>>
>> The example of this that I'm looking at is a SAMA5D2 with a minimum SPI
>> clock of 400kHz talking to an AVR-based SPI slave.  The AVR cannot put
>> bytes on the bus fast enough to keep up with the SoC's SPI controller
>> even at the lowest bus speed.
>>
>> This patch introduces the ability to specify a required inter-word
>> delay for SPI devices.  It is up to the controller driver to configure
>> itself accordingly in order to introduce the requested delay.
> 
> Can we configure it at runtime by the device rather than at DT time by
> the controller? If yes, we already have a patch for this, please
> check:
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eeaceb8b7d1fb64b6030249ca0dd1d902ef3069e
> 

It's a characteristic of the SPI slave, in the same sense as CPOL/CPHA 
are, and therefore it makes sense to specify it in the device tree.

Having this as device property rather than a transfer property allows 
this to be configured one time in setup() rather than having to fiddle 
with the configuration register for every transfer.

The two approaches are complementary.

/Jonas

>>
>> Signed-off-by: Jonas Bonn <jonas@norrbonn.se>
>> CC: Mark Brown <broonie@kernel.org>
>> CC: Rob Herring <robh+dt@kernel.org>
>> CC: Mark Rutland <mark.rutland@arm.com>
>> CC: linux-spi@vger.kernel.org
>> CC: devicetree@vger.kernel.org
>> ---
>>   Documentation/devicetree/bindings/spi/spi-bus.txt | 1 +
>>   drivers/spi/spi.c                                 | 4 ++++
>>   include/linux/spi/spi.h                           | 1 +
>>   3 files changed, 6 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/spi/spi-bus.txt b/Documentation/devicetree/bindings/spi/spi-bus.txt
>> index 1f6e86f787ef..a5f20060676d 100644
>> --- a/Documentation/devicetree/bindings/spi/spi-bus.txt
>> +++ b/Documentation/devicetree/bindings/spi/spi-bus.txt
>> @@ -77,6 +77,7 @@ All slave nodes can contain the following optional properties:
>>                      Defaults to 1 if not present.
>>   - spi-rx-delay-us - Microsecond delay after a read transfer.
>>   - spi-tx-delay-us - Microsecond delay after a write transfer.
>> +- spi-word-delay-us - Microsecond delay between individual words of a transfer
>>
>>   Some SPI controllers and devices support Dual and Quad SPI transfer mode.
>>   It allows data in the SPI system to be transferred using 2 wires (DUAL) or 4
>> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
>> index 9a7def7c3237..cd4d4065eca2 100644
>> --- a/drivers/spi/spi.c
>> +++ b/drivers/spi/spi.c
>> @@ -1692,6 +1692,10 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
>>          }
>>          spi->max_speed_hz = value;
>>
>> +       if (!of_property_read_u32(nc, "spi-word-delay-us", &value)) {
>> +               spi->word_delay = value;
>> +       }
>> +
>>          return 0;
>>   }
>>
>> diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
>> index 314d922ca607..e5200dd9d750 100644
>> --- a/include/linux/spi/spi.h
>> +++ b/include/linux/spi/spi.h
>> @@ -164,6 +164,7 @@ struct spi_device {
>>          char                    modalias[SPI_NAME_SIZE];
>>          const char              *driver_override;
>>          int                     cs_gpio;        /* chip select gpio */
>> +       uint16_t                word_delay;     /* inter-word delay (us) */
>>
>>          /* the statistics */
>>          struct spi_statistics   statistics;
>> --
>> 2.19.1
>>
> 
>
Mark Brown Jan. 25, 2019, 5:47 p.m. UTC | #3
On Fri, Jan 25, 2019 at 01:06:45PM +0100, Jonas Bonn wrote:
> On 25/01/2019 12:53, Baolin Wang wrote:
> > On Fri, 25 Jan 2019 at 19:44, Jonas Bonn <jonas@norrbonn.se> wrote:

> > Can we configure it at runtime by the device rather than at DT time by
> > the controller? If yes, we already have a patch for this, please
> > check:

> It's a characteristic of the SPI slave, in the same sense as CPOL/CPHA are,
> and therefore it makes sense to specify it in the device tree.

No, that doesn't follow at all.  There's two bits here - where the
configuration gets done and the mechanism by which it gets done.  If
something in DT is completely orthogonal to which device it is a
property of.

> Having this as device property rather than a transfer property allows this
> to be configured one time in setup() rather than having to fiddle with the
> configuration register for every transfer.

That doesn't mean that the coniguration should be done in DT though, and
given that this presumably is a property of the device there seems to be
no reason why we'd have it in DT - if every instance of the device is
going to need to set the property we should just figure it out from the
compatble string instead.
Mark Brown Jan. 25, 2019, 5:50 p.m. UTC | #4
On Fri, Jan 25, 2019 at 05:47:13PM +0000, Mark Brown wrote:
> On Fri, Jan 25, 2019 at 01:06:45PM +0100, Jonas Bonn wrote:

> > Having this as device property rather than a transfer property allows this
> > to be configured one time in setup() rather than having to fiddle with the
> > configuration register for every transfer.

> That doesn't mean that the coniguration should be done in DT though, and
> given that this presumably is a property of the device there seems to be
> no reason why we'd have it in DT - if every instance of the device is
> going to need to set the property we should just figure it out from the
> compatble string instead.

To be clear here: the suggestion is to add a parameter the slave device
can set in spi_device which sets the default word_delay similarly to how
max_speed_hz works.
Jonas Bonn Jan. 26, 2019, 7:52 a.m. UTC | #5
On 25/01/2019 18:50, Mark Brown wrote:
> On Fri, Jan 25, 2019 at 05:47:13PM +0000, Mark Brown wrote:
>> On Fri, Jan 25, 2019 at 01:06:45PM +0100, Jonas Bonn wrote:
> 
>>> Having this as device property rather than a transfer property allows this
>>> to be configured one time in setup() rather than having to fiddle with the
>>> configuration register for every transfer.
> 
>> That doesn't mean that the coniguration should be done in DT though, and
>> given that this presumably is a property of the device there seems to be
>> no reason why we'd have it in DT - if every instance of the device is
>> going to need to set the property we should just figure it out from the
>> compatble string instead.
> 
> To be clear here: the suggestion is to add a parameter the slave device
> can set in spi_device which sets the default word_delay similarly to how
> max_speed_hz works.
> 

I'm confused... isn't that exactly what this patch does?  It adds a 
field word_delay to spi_device in the same manner as max_speed_hz.

I also added the ability to set it via DT, which I can break out into a 
separate patch if that's an issue.  Or is the problem that it's set via 
DT, at all?  Documentation/devicetree/bindings/spi-bus.txt documents 10 
other slave-node properties related to transfer characteristics; 
word_delay is just another such characteristic.

But again, I'm having trouble parsing your response  Is the patch wrong, 
should be broken up, or you just misunderstood it?

Thanks,
/Jonas
Geert Uytterhoeven Jan. 26, 2019, 10:25 a.m. UTC | #6
Hi Jonas,

On Sat, Jan 26, 2019 at 8:53 AM Jonas Bonn <jonas@norrbonn.se> wrote:
> On 25/01/2019 18:50, Mark Brown wrote:
> > On Fri, Jan 25, 2019 at 05:47:13PM +0000, Mark Brown wrote:
> >> On Fri, Jan 25, 2019 at 01:06:45PM +0100, Jonas Bonn wrote:
> >>> Having this as device property rather than a transfer property allows this
> >>> to be configured one time in setup() rather than having to fiddle with the
> >>> configuration register for every transfer.
> >
> >> That doesn't mean that the coniguration should be done in DT though, and
> >> given that this presumably is a property of the device there seems to be
> >> no reason why we'd have it in DT - if every instance of the device is
> >> going to need to set the property we should just figure it out from the
> >> compatble string instead.
> >
> > To be clear here: the suggestion is to add a parameter the slave device
> > can set in spi_device which sets the default word_delay similarly to how
> > max_speed_hz works.
>
> I'm confused... isn't that exactly what this patch does?  It adds a
> field word_delay to spi_device in the same manner as max_speed_hz.
>
> I also added the ability to set it via DT, which I can break out into a
> separate patch if that's an issue.  Or is the problem that it's set via
> DT, at all?  Documentation/devicetree/bindings/spi-bus.txt documents 10
> other slave-node properties related to transfer characteristics;
> word_delay is just another such characteristic.
>
> But again, I'm having trouble parsing your response  Is the patch wrong,
> should be broken up, or you just misunderstood it?

IIUIC, Mark means that it may be a non-configurable property of the slave
device, and thus should be handled (fixed setting) in the SPI slave driver.

Compare this to CPHA/CPOL, which are properties of the SPI slave device,
but which may be configurable. E.g. many SPI FLASHes support multiple
configurations. See e.g. commit 9c5becce21af35e5 ("ARM: shmobile: koelsch:
Fix QSPI mode of SPI-Flash into mode3").

Again, max_speed_hz is something different: while both the SPI master and
slave may support high speeds, board wiring (capacitance/inductance) may
need to force a slower speed than supported by the devices, so it makes
sense to make that configurable from DT.

Gr{oetje,eeting}s,

                        Geert
Jonas Bonn Jan. 26, 2019, 3:40 p.m. UTC | #7
Hi Geert,

On 26/01/2019 11:25, Geert Uytterhoeven wrote:
> Hi Jonas,
> 
> On Sat, Jan 26, 2019 at 8:53 AM Jonas Bonn <jonas@norrbonn.se> wrote:
>> On 25/01/2019 18:50, Mark Brown wrote:
>>> On Fri, Jan 25, 2019 at 05:47:13PM +0000, Mark Brown wrote:
>>>> On Fri, Jan 25, 2019 at 01:06:45PM +0100, Jonas Bonn wrote:
>>>>> Having this as device property rather than a transfer property allows this
>>>>> to be configured one time in setup() rather than having to fiddle with the
>>>>> configuration register for every transfer.
>>>
>>>> That doesn't mean that the coniguration should be done in DT though, and
>>>> given that this presumably is a property of the device there seems to be
>>>> no reason why we'd have it in DT - if every instance of the device is
>>>> going to need to set the property we should just figure it out from the
>>>> compatble string instead.
>>>
>>> To be clear here: the suggestion is to add a parameter the slave device
>>> can set in spi_device which sets the default word_delay similarly to how
>>> max_speed_hz works.
>>
>> I'm confused... isn't that exactly what this patch does?  It adds a
>> field word_delay to spi_device in the same manner as max_speed_hz.
>>
>> I also added the ability to set it via DT, which I can break out into a
>> separate patch if that's an issue.  Or is the problem that it's set via
>> DT, at all?  Documentation/devicetree/bindings/spi-bus.txt documents 10
>> other slave-node properties related to transfer characteristics;
>> word_delay is just another such characteristic.
>>
>> But again, I'm having trouble parsing your response  Is the patch wrong,
>> should be broken up, or you just misunderstood it?
> 
> IIUIC, Mark means that it may be a non-configurable property of the slave
> device, and thus should be handled (fixed setting) in the SPI slave driver.

OK, so given that the "compatible" property identifies the hardware and 
there is no other _hardware_ configuration detail that affects the 
required inter-word delay, then setting the property in the device tree 
is not allowed as the driver has enough info to set it properly.  Fair 
enough!

> 
> Compare this to CPHA/CPOL, which are properties of the SPI slave device,
> but which may be configurable. E.g. many SPI FLASHes support multiple
> configurations. See e.g. commit 9c5becce21af35e5 ("ARM: shmobile: koelsch:
> Fix QSPI mode of SPI-Flash into mode3").

There is nothing about the hardware referenced in that patch that 
enforces either mode.  Why does the driver get to defer to DT here?

Looking at Documentation/devicetree/bindings/spi/spi-bus.txt:

spi-lsb-first:  used only by MAXIM DS-1302 which is always LSB first; 
driver should set this

spi-3wire: again, only set by MAXIM DS-1302 which always needs this 
setting; driver could set this

spi-tx-delay-us:
spi-rx-delay-us:  only parsed by RMI4 driver... no DTS files in kernel 
set these.  I hardly see how these are "hardware" settings rather than 
message settings, but the driver can set these in any case.

Anyway, the point is, looking at the current documentation, it's pretty 
difficult to understand whether devicetree is restricted to describing 
hardware or is also for configuring drivers...

> 
> Again, max_speed_hz is something different: while both the SPI master and
> slave may support high speeds, board wiring (capacitance/inductance) may
> need to force a slower speed than supported by the devices, so it makes
> sense to make that configurable from DT.

Yeah, that one make sense.  But if the DT is only overriding the maximum 
device frequency that the driver should otherwise be setting, why is 
spi-max-frequency a _required_ property?

Thanks for taking the time to provide the additional explanation.  I had 
to ruminate on it for a bit, but I think it's starting to sink in now!

/Jonas

> 
> Gr{oetje,eeting}s,
> 
>                          Geert
>
Geert Uytterhoeven Jan. 28, 2019, 7:41 a.m. UTC | #8
Hi Jonas,

On Sat, Jan 26, 2019 at 4:40 PM Jonas Bonn <jonas@norrbonn.se> wrote:
> On 26/01/2019 11:25, Geert Uytterhoeven wrote:
> > On Sat, Jan 26, 2019 at 8:53 AM Jonas Bonn <jonas@norrbonn.se> wrote:
> >> On 25/01/2019 18:50, Mark Brown wrote:
> >>> On Fri, Jan 25, 2019 at 05:47:13PM +0000, Mark Brown wrote:
> >>>> On Fri, Jan 25, 2019 at 01:06:45PM +0100, Jonas Bonn wrote:
> >>>>> Having this as device property rather than a transfer property allows this
> >>>>> to be configured one time in setup() rather than having to fiddle with the
> >>>>> configuration register for every transfer.
> >>>
> >>>> That doesn't mean that the coniguration should be done in DT though, and
> >>>> given that this presumably is a property of the device there seems to be
> >>>> no reason why we'd have it in DT - if every instance of the device is
> >>>> going to need to set the property we should just figure it out from the
> >>>> compatble string instead.
> >>>
> >>> To be clear here: the suggestion is to add a parameter the slave device
> >>> can set in spi_device which sets the default word_delay similarly to how
> >>> max_speed_hz works.
> >>
> >> I'm confused... isn't that exactly what this patch does?  It adds a
> >> field word_delay to spi_device in the same manner as max_speed_hz.
> >>
> >> I also added the ability to set it via DT, which I can break out into a
> >> separate patch if that's an issue.  Or is the problem that it's set via
> >> DT, at all?  Documentation/devicetree/bindings/spi-bus.txt documents 10
> >> other slave-node properties related to transfer characteristics;
> >> word_delay is just another such characteristic.
> >>
> >> But again, I'm having trouble parsing your response  Is the patch wrong,
> >> should be broken up, or you just misunderstood it?
> >
> > IIUIC, Mark means that it may be a non-configurable property of the slave
> > device, and thus should be handled (fixed setting) in the SPI slave driver.
>
> OK, so given that the "compatible" property identifies the hardware and
> there is no other _hardware_ configuration detail that affects the
> required inter-word delay, then setting the property in the device tree
> is not allowed as the driver has enough info to set it properly.  Fair
> enough!
>
> >
> > Compare this to CPHA/CPOL, which are properties of the SPI slave device,
> > but which may be configurable. E.g. many SPI FLASHes support multiple
> > configurations. See e.g. commit 9c5becce21af35e5 ("ARM: shmobile: koelsch:
> > Fix QSPI mode of SPI-Flash into mode3").
>
> There is nothing about the hardware referenced in that patch that
> enforces either mode.  Why does the driver get to defer to DT here?

The default is non-cpol and non-pha.
The device supports both (perhaps even all four modes, didn't check).

> Looking at Documentation/devicetree/bindings/spi/spi-bus.txt:
>
> spi-lsb-first:  used only by MAXIM DS-1302 which is always LSB first;
> driver should set this

For DS1302, this is probable true.
For e.g. a generic shift register (e.g. hc595), the driver cannot know.

> spi-3wire: again, only set by MAXIM DS-1302 which always needs this
> setting; driver could set this

For DS1302, this is probable true.
Some devices may support both 4-wire or 3-wire mode?

> spi-tx-delay-us:
> spi-rx-delay-us:  only parsed by RMI4 driver... no DTS files in kernel
> set these.  I hardly see how these are "hardware" settings rather than
> message settings, but the driver can set these in any case.
>
> Anyway, the point is, looking at the current documentation, it's pretty
> difficult to understand whether devicetree is restricted to describing
> hardware or is also for configuring drivers...

True.

> > Again, max_speed_hz is something different: while both the SPI master and
> > slave may support high speeds, board wiring (capacitance/inductance) may
> > need to force a slower speed than supported by the devices, so it makes
> > sense to make that configurable from DT.
>
> Yeah, that one make sense.  But if the DT is only overriding the maximum
> device frequency that the driver should otherwise be setting, why is
> spi-max-frequency a _required_ property?

That's a good question. Legacy?

> Thanks for taking the time to provide the additional explanation.  I had
> to ruminate on it for a bit, but I think it's starting to sink in now!

You're welcome!

Gr{oetje,eeting}s,

                        Geert
Mark Brown Jan. 28, 2019, 11:47 a.m. UTC | #9
On Mon, Jan 28, 2019 at 08:41:05AM +0100, Geert Uytterhoeven wrote:
> On Sat, Jan 26, 2019 at 4:40 PM Jonas Bonn <jonas@norrbonn.se> wrote:

> > spi-3wire: again, only set by MAXIM DS-1302 which always needs this
> > setting; driver could set this

> For DS1302, this is probable true.
> Some devices may support both 4-wire or 3-wire mode?

IIRC yes.

> > Yeah, that one make sense.  But if the DT is only overriding the maximum
> > device frequency that the driver should otherwise be setting, why is
> > spi-max-frequency a _required_ property?

> That's a good question. Legacy?

It's a documentation error.
Jonas Bonn Jan. 28, 2019, 11:51 a.m. UTC | #10
On 28/01/2019 12:47, Mark Brown wrote:
> On Mon, Jan 28, 2019 at 08:41:05AM +0100, Geert Uytterhoeven wrote:
>> On Sat, Jan 26, 2019 at 4:40 PM Jonas Bonn <jonas@norrbonn.se> wrote:
> 
>>> spi-3wire: again, only set by MAXIM DS-1302 which always needs this
>>> setting; driver could set this
> 
>> For DS1302, this is probable true.
>> Some devices may support both 4-wire or 3-wire mode?
> 
> IIRC yes.

Just for the record, the datasheet says it's exclusively 3-wire.  But 
it's not important...

/Jonas

> 
>>> Yeah, that one make sense.  But if the DT is only overriding the maximum
>>> device frequency that the driver should otherwise be setting, why is
>>> spi-max-frequency a _required_ property?
> 
>> That's a good question. Legacy?
> 
> It's a documentation error.
>
Geert Uytterhoeven Jan. 28, 2019, 11:54 a.m. UTC | #11
Hi Jonas,

On Mon, Jan 28, 2019 at 12:51 PM Jonas Bonn <jonas@norrbonn.se> wrote:
> On 28/01/2019 12:47, Mark Brown wrote:
> > On Mon, Jan 28, 2019 at 08:41:05AM +0100, Geert Uytterhoeven wrote:
> >> On Sat, Jan 26, 2019 at 4:40 PM Jonas Bonn <jonas@norrbonn.se> wrote:
> >
> >>> spi-3wire: again, only set by MAXIM DS-1302 which always needs this
> >>> setting; driver could set this
> >
> >> For DS1302, this is probable true.
> >> Some devices may support both 4-wire or 3-wire mode?
> >
> > IIRC yes.
>
> Just for the record, the datasheet says it's exclusively 3-wire.  But
> it's not important...

With "some devices" I meant "some other non-DS1302 devices supporting
3-wire mode". Sorry for being unclear.

Gr{oetje,eeting}s,

                        Geert
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/spi/spi-bus.txt b/Documentation/devicetree/bindings/spi/spi-bus.txt
index 1f6e86f787ef..a5f20060676d 100644
--- a/Documentation/devicetree/bindings/spi/spi-bus.txt
+++ b/Documentation/devicetree/bindings/spi/spi-bus.txt
@@ -77,6 +77,7 @@  All slave nodes can contain the following optional properties:
 		    Defaults to 1 if not present.
 - spi-rx-delay-us - Microsecond delay after a read transfer.
 - spi-tx-delay-us - Microsecond delay after a write transfer.
+- spi-word-delay-us - Microsecond delay between individual words of a transfer
 
 Some SPI controllers and devices support Dual and Quad SPI transfer mode.
 It allows data in the SPI system to be transferred using 2 wires (DUAL) or 4
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 9a7def7c3237..cd4d4065eca2 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1692,6 +1692,10 @@  static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
 	}
 	spi->max_speed_hz = value;
 
+	if (!of_property_read_u32(nc, "spi-word-delay-us", &value)) {
+		spi->word_delay = value;
+	}
+
 	return 0;
 }
 
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 314d922ca607..e5200dd9d750 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -164,6 +164,7 @@  struct spi_device {
 	char			modalias[SPI_NAME_SIZE];
 	const char		*driver_override;
 	int			cs_gpio;	/* chip select gpio */
+	uint16_t		word_delay;	/* inter-word delay (us) */
 
 	/* the statistics */
 	struct spi_statistics	statistics;