| Message ID | 20240910234440.1045098-1-robh@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | dt-bindings: iio: dac: adi,ad56xx: Fix duplicate compatible strings | expand |
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
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>
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
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
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
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
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(-)