dt-bindings: iio: dac: adi,ad56xx: Fix duplicate compatible strings
Subsystems (3)
Rob Herring (Arm)
maintainerPATCH 1/1 dt-bindings: iio: dac: adi,ad56xx: Fix duplicate compatible strings
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.
--- .../bindings/iio/dac/adi,ad5686.yaml | 53 ++++++------------- .../bindings/iio/dac/adi,ad5696.yaml | 3 +- 2 files changed, 19 insertions(+), 37 deletions(-)
Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml +17 -36
@@ -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 <[email protected]>
@@ -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
Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml +2 -1
@@ -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 <[email protected]>
@@ -16,6 +16,7 @@ properties: compatible: enum: - adi,ad5311r + - adi,ad5337r - adi,ad5338r - adi,ad5671r - adi,ad5675r
Signature · 1 line
2.45.2
Quoted 8 lines · Rob Herring (Arm)
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) <[email protected]>---
Quoted 98 lines
.../bindings/iio/dac/adi,ad5686.yaml | 53 ++++++------------- .../bindings/iio/dac/adi,ad5696.yaml | 3 +-
2 files changed, 19 insertions(+), 37 deletions(-)Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml +0
-0@@ -4,7 +4,7 @@$id: http://devicetree.org/schemas/iio/dac/adi,ad5686.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml +1
-1-title: Analog Devices AD5360 and similar DACs +title: Analog Devices AD5360 and similar SPI DACs
maintainers:
- Michael Hennerich <[email protected]>Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml +0
-0@@ -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: 1Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml +0
-0@@ -4,7 +4,7 @@$id: http://devicetree.org/schemas/iio/dac/adi,ad5696.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml +1
-1-title: Analog Devices AD5696 and similar multi-channel DACs +title: Analog Devices AD5696 and similar I2C multi-channel DACs
maintainers:
- Michael Auchter <[email protected]>Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml +0
-0@@ -16,6 +16,7 @@ properties:compatible:
enum:
- adi,ad5311r
+ - adi,ad5337r
- adi,ad5338r
- adi,ad5671r
- adi,ad5675r
Quoted 7 lines · Rob Herring (Arm)
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) <[email protected]>
Jonathan Cameron
maintainerQuoted 7 lines · On Tue, 10 Sep 2024 18:44:39 -0500 "Rob Herring (Arm)" <[email protected]> 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) <[email protected]>
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
Quoted 97 lines
--- .../bindings/iio/dac/adi,ad5686.yaml | 53 ++++++------------- .../bindings/iio/dac/adi,ad5696.yaml | 3 +- 2 files changed, 19 insertions(+), 37 deletions(-)Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml +17
-36@@ -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 <[email protected]>@@ -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: 1Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml +2
-1@@ -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 <[email protected]>@@ -16,6 +16,7 @@ properties: compatible: enum: - adi,ad5311r + - adi,ad5337r - adi,ad5338r - adi,ad5671r - adi,ad5675r
Rob Herring
maintainerQuoted 10 lines · Jonathan Cameron
Quoted 6 lines · On Tue, 10 Sep 2024 18:44:39 -0500 "Rob Herring (Arm)" <[email protected]> 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.
Quoted 4 lines
Quoted 1 line
Signed-off-by Rob Herring (Arm) <[email protected]>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
Jonathan Cameron
maintainerQuoted 11 lines · On Mon, 16 Sep 2024 10:22:19 -0500 Rob Herring <[email protected]> wrote:
Quoted 10 lines · Jonathan Cameron
Quoted 6 lines · On Tue, 10 Sep 2024 18:44:39 -0500 "Rob Herring (Arm)" <[email protected]> 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.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Rob Herring (Arm) <[email protected]>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
Quoted 2 lines
Rob