* [PATCH] dt-bindings: iio: dac: adi,ad56xx: Fix duplicate compatible strings
@ 2024-09-10 23:44 Rob Herring (Arm)
2024-09-11 7:15 ` Nuno Sá
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Rob Herring (Arm) @ 2024-09-10 23:44 UTC (permalink / raw)
To: Lars-Peter Clausen, Michael Hennerich, Jonathan Cameron,
Krzysztof Kozlowski, Conor Dooley, Michael Auchter
Cc: Michael Hennerich, linux-iio, devicetree, linux-kernel
adi,ad5686.yaml and adi,ad5696.yaml duplicate all the I2C device
compatible strings with the exception of "adi,ad5337r". Since
adi,ad5686.yaml references spi-peripheral-props.yaml, drop the I2C
devices from it making it only SPI devices. Update the titles to make
the distinction clear.
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
.../bindings/iio/dac/adi,ad5686.yaml | 53 ++++++-------------
.../bindings/iio/dac/adi,ad5696.yaml | 3 +-
2 files changed, 19 insertions(+), 37 deletions(-)
diff --git a/Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml b/Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml
index b4400c52bec3..713f535bb33a 100644
--- a/Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml
+++ b/Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml
@@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/iio/dac/adi,ad5686.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
-title: Analog Devices AD5360 and similar DACs
+title: Analog Devices AD5360 and similar SPI DACs
maintainers:
- Michael Hennerich <michael.hennerich@analog.com>
@@ -12,41 +12,22 @@ maintainers:
properties:
compatible:
- oneOf:
- - description: SPI devices
- enum:
- - adi,ad5310r
- - adi,ad5672r
- - adi,ad5674r
- - adi,ad5676
- - adi,ad5676r
- - adi,ad5679r
- - adi,ad5681r
- - adi,ad5682r
- - adi,ad5683
- - adi,ad5683r
- - adi,ad5684
- - adi,ad5684r
- - adi,ad5685r
- - adi,ad5686
- - adi,ad5686r
- - description: I2C devices
- enum:
- - adi,ad5311r
- - adi,ad5337r
- - adi,ad5338r
- - adi,ad5671r
- - adi,ad5675r
- - adi,ad5691r
- - adi,ad5692r
- - adi,ad5693
- - adi,ad5693r
- - adi,ad5694
- - adi,ad5694r
- - adi,ad5695r
- - adi,ad5696
- - adi,ad5696r
-
+ enum:
+ - adi,ad5310r
+ - adi,ad5672r
+ - adi,ad5674r
+ - adi,ad5676
+ - adi,ad5676r
+ - adi,ad5679r
+ - adi,ad5681r
+ - adi,ad5682r
+ - adi,ad5683
+ - adi,ad5683r
+ - adi,ad5684
+ - adi,ad5684r
+ - adi,ad5685r
+ - adi,ad5686
+ - adi,ad5686r
reg:
maxItems: 1
diff --git a/Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml b/Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml
index 56b0cda0f30a..b5a88b03dc2f 100644
--- a/Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml
+++ b/Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml
@@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/iio/dac/adi,ad5696.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
-title: Analog Devices AD5696 and similar multi-channel DACs
+title: Analog Devices AD5696 and similar I2C multi-channel DACs
maintainers:
- Michael Auchter <michael.auchter@ni.com>
@@ -16,6 +16,7 @@ properties:
compatible:
enum:
- adi,ad5311r
+ - adi,ad5337r
- adi,ad5338r
- adi,ad5671r
- adi,ad5675r
--
2.45.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] dt-bindings: iio: dac: adi,ad56xx: Fix duplicate compatible strings
2024-09-10 23:44 [PATCH] dt-bindings: iio: dac: adi,ad56xx: Fix duplicate compatible strings Rob Herring (Arm)
@ 2024-09-11 7:15 ` Nuno Sá
2024-09-11 19:12 ` Conor Dooley
2024-09-14 14:18 ` Jonathan Cameron
2 siblings, 0 replies; 6+ messages in thread
From: Nuno Sá @ 2024-09-11 7:15 UTC (permalink / raw)
To: Rob Herring (Arm), Lars-Peter Clausen, Michael Hennerich,
Jonathan Cameron, Krzysztof Kozlowski, Conor Dooley,
Michael Auchter
Cc: linux-iio, devicetree, linux-kernel
On Tue, 2024-09-10 at 18:44 -0500, Rob Herring (Arm) wrote:
> adi,ad5686.yaml and adi,ad5696.yaml duplicate all the I2C device
> compatible strings with the exception of "adi,ad5337r". Since
> adi,ad5686.yaml references spi-peripheral-props.yaml, drop the I2C
> devices from it making it only SPI devices. Update the titles to make
> the distinction clear.
>
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> ---
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
> .../bindings/iio/dac/adi,ad5686.yaml | 53 ++++++-------------
> .../bindings/iio/dac/adi,ad5696.yaml | 3 +-
> 2 files changed, 19 insertions(+), 37 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml
> b/Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml
> index b4400c52bec3..713f535bb33a 100644
> --- a/Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml
> +++ b/Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml
> @@ -4,7 +4,7 @@
> $id: http://devicetree.org/schemas/iio/dac/adi,ad5686.yaml#
> $schema: http://devicetree.org/meta-schemas/core.yaml#
>
> -title: Analog Devices AD5360 and similar DACs
> +title: Analog Devices AD5360 and similar SPI DACs
>
> maintainers:
> - Michael Hennerich <michael.hennerich@analog.com>
> @@ -12,41 +12,22 @@ maintainers:
>
> properties:
> compatible:
> - oneOf:
> - - description: SPI devices
> - enum:
> - - adi,ad5310r
> - - adi,ad5672r
> - - adi,ad5674r
> - - adi,ad5676
> - - adi,ad5676r
> - - adi,ad5679r
> - - adi,ad5681r
> - - adi,ad5682r
> - - adi,ad5683
> - - adi,ad5683r
> - - adi,ad5684
> - - adi,ad5684r
> - - adi,ad5685r
> - - adi,ad5686
> - - adi,ad5686r
> - - description: I2C devices
> - enum:
> - - adi,ad5311r
> - - adi,ad5337r
> - - adi,ad5338r
> - - adi,ad5671r
> - - adi,ad5675r
> - - adi,ad5691r
> - - adi,ad5692r
> - - adi,ad5693
> - - adi,ad5693r
> - - adi,ad5694
> - - adi,ad5694r
> - - adi,ad5695r
> - - adi,ad5696
> - - adi,ad5696r
> -
> + enum:
> + - adi,ad5310r
> + - adi,ad5672r
> + - adi,ad5674r
> + - adi,ad5676
> + - adi,ad5676r
> + - adi,ad5679r
> + - adi,ad5681r
> + - adi,ad5682r
> + - adi,ad5683
> + - adi,ad5683r
> + - adi,ad5684
> + - adi,ad5684r
> + - adi,ad5685r
> + - adi,ad5686
> + - adi,ad5686r
>
> reg:
> maxItems: 1
> diff --git a/Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml
> b/Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml
> index 56b0cda0f30a..b5a88b03dc2f 100644
> --- a/Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml
> +++ b/Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml
> @@ -4,7 +4,7 @@
> $id: http://devicetree.org/schemas/iio/dac/adi,ad5696.yaml#
> $schema: http://devicetree.org/meta-schemas/core.yaml#
>
> -title: Analog Devices AD5696 and similar multi-channel DACs
> +title: Analog Devices AD5696 and similar I2C multi-channel DACs
>
> maintainers:
> - Michael Auchter <michael.auchter@ni.com>
> @@ -16,6 +16,7 @@ properties:
> compatible:
> enum:
> - adi,ad5311r
> + - adi,ad5337r
> - adi,ad5338r
> - adi,ad5671r
> - adi,ad5675r
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dt-bindings: iio: dac: adi,ad56xx: Fix duplicate compatible strings
2024-09-10 23:44 [PATCH] dt-bindings: iio: dac: adi,ad56xx: Fix duplicate compatible strings Rob Herring (Arm)
2024-09-11 7:15 ` Nuno Sá
@ 2024-09-11 19:12 ` Conor Dooley
2024-09-14 14:18 ` Jonathan Cameron
2 siblings, 0 replies; 6+ messages in thread
From: Conor Dooley @ 2024-09-11 19:12 UTC (permalink / raw)
To: Rob Herring (Arm)
Cc: Lars-Peter Clausen, Michael Hennerich, Jonathan Cameron,
Krzysztof Kozlowski, Conor Dooley, Michael Auchter, linux-iio,
devicetree, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
On Tue, Sep 10, 2024 at 06:44:39PM -0500, Rob Herring (Arm) wrote:
> adi,ad5686.yaml and adi,ad5696.yaml duplicate all the I2C device
> compatible strings with the exception of "adi,ad5337r". Since
> adi,ad5686.yaml references spi-peripheral-props.yaml, drop the I2C
> devices from it making it only SPI devices. Update the titles to make
> the distinction clear.
>
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dt-bindings: iio: dac: adi,ad56xx: Fix duplicate compatible strings
2024-09-10 23:44 [PATCH] dt-bindings: iio: dac: adi,ad56xx: Fix duplicate compatible strings Rob Herring (Arm)
2024-09-11 7:15 ` Nuno Sá
2024-09-11 19:12 ` Conor Dooley
@ 2024-09-14 14:18 ` Jonathan Cameron
2024-09-16 15:22 ` Rob Herring
2 siblings, 1 reply; 6+ messages in thread
From: Jonathan Cameron @ 2024-09-14 14:18 UTC (permalink / raw)
To: Rob Herring (Arm)
Cc: Lars-Peter Clausen, Michael Hennerich, Krzysztof Kozlowski,
Conor Dooley, Michael Auchter, linux-iio, devicetree,
linux-kernel
On Tue, 10 Sep 2024 18:44:39 -0500
"Rob Herring (Arm)" <robh@kernel.org> wrote:
> adi,ad5686.yaml and adi,ad5696.yaml duplicate all the I2C device
> compatible strings with the exception of "adi,ad5337r". Since
> adi,ad5686.yaml references spi-peripheral-props.yaml, drop the I2C
> devices from it making it only SPI devices. Update the titles to make
> the distinction clear.
>
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Is this an urgent thing, or can it wait for the merge window after next?
For now I've queued it up for then in my testing branch but can yank it
out and send it as a fix after rc1 if that is useful.
Jonathan
> ---
> .../bindings/iio/dac/adi,ad5686.yaml | 53 ++++++-------------
> .../bindings/iio/dac/adi,ad5696.yaml | 3 +-
> 2 files changed, 19 insertions(+), 37 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml b/Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml
> index b4400c52bec3..713f535bb33a 100644
> --- a/Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml
> +++ b/Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml
> @@ -4,7 +4,7 @@
> $id: http://devicetree.org/schemas/iio/dac/adi,ad5686.yaml#
> $schema: http://devicetree.org/meta-schemas/core.yaml#
>
> -title: Analog Devices AD5360 and similar DACs
> +title: Analog Devices AD5360 and similar SPI DACs
>
> maintainers:
> - Michael Hennerich <michael.hennerich@analog.com>
> @@ -12,41 +12,22 @@ maintainers:
>
> properties:
> compatible:
> - oneOf:
> - - description: SPI devices
> - enum:
> - - adi,ad5310r
> - - adi,ad5672r
> - - adi,ad5674r
> - - adi,ad5676
> - - adi,ad5676r
> - - adi,ad5679r
> - - adi,ad5681r
> - - adi,ad5682r
> - - adi,ad5683
> - - adi,ad5683r
> - - adi,ad5684
> - - adi,ad5684r
> - - adi,ad5685r
> - - adi,ad5686
> - - adi,ad5686r
> - - description: I2C devices
> - enum:
> - - adi,ad5311r
> - - adi,ad5337r
> - - adi,ad5338r
> - - adi,ad5671r
> - - adi,ad5675r
> - - adi,ad5691r
> - - adi,ad5692r
> - - adi,ad5693
> - - adi,ad5693r
> - - adi,ad5694
> - - adi,ad5694r
> - - adi,ad5695r
> - - adi,ad5696
> - - adi,ad5696r
> -
> + enum:
> + - adi,ad5310r
> + - adi,ad5672r
> + - adi,ad5674r
> + - adi,ad5676
> + - adi,ad5676r
> + - adi,ad5679r
> + - adi,ad5681r
> + - adi,ad5682r
> + - adi,ad5683
> + - adi,ad5683r
> + - adi,ad5684
> + - adi,ad5684r
> + - adi,ad5685r
> + - adi,ad5686
> + - adi,ad5686r
>
> reg:
> maxItems: 1
> diff --git a/Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml b/Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml
> index 56b0cda0f30a..b5a88b03dc2f 100644
> --- a/Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml
> +++ b/Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml
> @@ -4,7 +4,7 @@
> $id: http://devicetree.org/schemas/iio/dac/adi,ad5696.yaml#
> $schema: http://devicetree.org/meta-schemas/core.yaml#
>
> -title: Analog Devices AD5696 and similar multi-channel DACs
> +title: Analog Devices AD5696 and similar I2C multi-channel DACs
>
> maintainers:
> - Michael Auchter <michael.auchter@ni.com>
> @@ -16,6 +16,7 @@ properties:
> compatible:
> enum:
> - adi,ad5311r
> + - adi,ad5337r
> - adi,ad5338r
> - adi,ad5671r
> - adi,ad5675r
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dt-bindings: iio: dac: adi,ad56xx: Fix duplicate compatible strings
2024-09-14 14:18 ` Jonathan Cameron
@ 2024-09-16 15:22 ` Rob Herring
2024-09-28 13:50 ` Jonathan Cameron
0 siblings, 1 reply; 6+ messages in thread
From: Rob Herring @ 2024-09-16 15:22 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Lars-Peter Clausen, Michael Hennerich, Krzysztof Kozlowski,
Conor Dooley, Michael Auchter, linux-iio, devicetree,
linux-kernel
On Sat, Sep 14, 2024 at 9:18 AM Jonathan Cameron <jic23@kernel.org> wrote:
>
> On Tue, 10 Sep 2024 18:44:39 -0500
> "Rob Herring (Arm)" <robh@kernel.org> wrote:
>
> > adi,ad5686.yaml and adi,ad5696.yaml duplicate all the I2C device
> > compatible strings with the exception of "adi,ad5337r". Since
> > adi,ad5686.yaml references spi-peripheral-props.yaml, drop the I2C
> > devices from it making it only SPI devices. Update the titles to make
> > the distinction clear.
> >
> > Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> Is this an urgent thing, or can it wait for the merge window after next?
> For now I've queued it up for then in my testing branch but can yank it
> out and send it as a fix after rc1 if that is useful.
Sooner would be better. It's now a warning in dtschema main branch.
The issue is not so much the duplication, but that which schema gets
applied is not deterministic.
Rob
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dt-bindings: iio: dac: adi,ad56xx: Fix duplicate compatible strings
2024-09-16 15:22 ` Rob Herring
@ 2024-09-28 13:50 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2024-09-28 13:50 UTC (permalink / raw)
To: Rob Herring
Cc: Lars-Peter Clausen, Michael Hennerich, Krzysztof Kozlowski,
Conor Dooley, Michael Auchter, linux-iio, devicetree,
linux-kernel
On Mon, 16 Sep 2024 10:22:19 -0500
Rob Herring <robh@kernel.org> wrote:
> On Sat, Sep 14, 2024 at 9:18 AM Jonathan Cameron <jic23@kernel.org> wrote:
> >
> > On Tue, 10 Sep 2024 18:44:39 -0500
> > "Rob Herring (Arm)" <robh@kernel.org> wrote:
> >
> > > adi,ad5686.yaml and adi,ad5696.yaml duplicate all the I2C device
> > > compatible strings with the exception of "adi,ad5337r". Since
> > > adi,ad5686.yaml references spi-peripheral-props.yaml, drop the I2C
> > > devices from it making it only SPI devices. Update the titles to make
> > > the distinction clear.
> > >
> > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> > Is this an urgent thing, or can it wait for the merge window after next?
> > For now I've queued it up for then in my testing branch but can yank it
> > out and send it as a fix after rc1 if that is useful.
>
> Sooner would be better. It's now a warning in dtschema main branch.
> The issue is not so much the duplication, but that which schema gets
> applied is not deterministic.
Shifted it to my fixes-togreg branch. I'll do a pull request for that
fairly soon (once rc1 is out and it's had a little soak in next)
Thanks,
Jonathan
>
> Rob
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-09-28 13:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-10 23:44 [PATCH] dt-bindings: iio: dac: adi,ad56xx: Fix duplicate compatible strings Rob Herring (Arm)
2024-09-11 7:15 ` Nuno Sá
2024-09-11 19:12 ` Conor Dooley
2024-09-14 14:18 ` Jonathan Cameron
2024-09-16 15:22 ` Rob Herring
2024-09-28 13:50 ` Jonathan Cameron
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).