On Mon, 17 Feb 2020 19:42:39 -0800 Matt Ranostay <matt.ranostay@xxxxxxxxxxxx> wrote: > Since Atlas Scientific device support only varies from the compatible > string is ideal all the respective docs are merged into a single doc > named atlas,sensor.yaml > > Reviewed-by: Rob Herring <robh@xxxxxxxxxx> > Signed-off-by: Matt Ranostay <matt.ranostay@xxxxxxxxxxxx> Great. Appiled to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > .../bindings/iio/chemical/atlas,ec-sm.txt | 21 -------- > .../bindings/iio/chemical/atlas,orp-sm.txt | 21 -------- > .../bindings/iio/chemical/atlas,ph-sm.txt | 21 -------- > .../bindings/iio/chemical/atlas,sensor.yaml | 53 +++++++++++++++++++ > 4 files changed, 53 insertions(+), 63 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,ec-sm.txt > delete mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,orp-sm.txt > delete mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,ph-sm.txt > create mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml > > diff --git a/Documentation/devicetree/bindings/iio/chemical/atlas,ec-sm.txt b/Documentation/devicetree/bindings/iio/chemical/atlas,ec-sm.txt > deleted file mode 100644 > index f4320595b851..000000000000 > --- a/Documentation/devicetree/bindings/iio/chemical/atlas,ec-sm.txt > +++ /dev/null > @@ -1,21 +0,0 @@ > -* Atlas Scientific EC-SM OEM sensor > - > -http://www.atlas-scientific.com/_files/_datasheets/_oem/EC_oem_datasheet.pdf > - > -Required properties: > - > - - compatible: must be "atlas,ec-sm" > - - reg: the I2C address of the sensor > - - interrupts: the sole interrupt generated by the device > - > - Refer to interrupt-controller/interrupts.txt for generic interrupt client > - node bindings. > - > -Example: > - > -atlas@64 { > - compatible = "atlas,ec-sm"; > - reg = <0x64>; > - interrupt-parent = <&gpio1>; > - interrupts = <16 2>; > -}; > diff --git a/Documentation/devicetree/bindings/iio/chemical/atlas,orp-sm.txt b/Documentation/devicetree/bindings/iio/chemical/atlas,orp-sm.txt > deleted file mode 100644 > index af1f5a9aa4da..000000000000 > --- a/Documentation/devicetree/bindings/iio/chemical/atlas,orp-sm.txt > +++ /dev/null > @@ -1,21 +0,0 @@ > -* Atlas Scientific ORP-SM OEM sensor > - > -https://www.atlas-scientific.com/_files/_datasheets/_oem/ORP_oem_datasheet.pdf > - > -Required properties: > - > - - compatible: must be "atlas,orp-sm" > - - reg: the I2C address of the sensor > - - interrupts: the sole interrupt generated by the device > - > - Refer to interrupt-controller/interrupts.txt for generic interrupt client > - node bindings. > - > -Example: > - > -atlas@66 { > - compatible = "atlas,orp-sm"; > - reg = <0x66>; > - interrupt-parent = <&gpio1>; > - interrupts = <16 2>; > -}; > diff --git a/Documentation/devicetree/bindings/iio/chemical/atlas,ph-sm.txt b/Documentation/devicetree/bindings/iio/chemical/atlas,ph-sm.txt > deleted file mode 100644 > index 79d90f060327..000000000000 > --- a/Documentation/devicetree/bindings/iio/chemical/atlas,ph-sm.txt > +++ /dev/null > @@ -1,21 +0,0 @@ > -* Atlas Scientific pH-SM OEM sensor > - > -http://www.atlas-scientific.com/_files/_datasheets/_oem/pH_oem_datasheet.pdf > - > -Required properties: > - > - - compatible: must be "atlas,ph-sm" > - - reg: the I2C address of the sensor > - - interrupts: the sole interrupt generated by the device > - > - Refer to interrupt-controller/interrupts.txt for generic interrupt client > - node bindings. > - > -Example: > - > -atlas@65 { > - compatible = "atlas,ph-sm"; > - reg = <0x65>; > - interrupt-parent = <&gpio1>; > - interrupts = <16 2>; > -}; > diff --git a/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml b/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml > new file mode 100644 > index 000000000000..edcd2904d50e > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml > @@ -0,0 +1,53 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/iio/chemical/atlas,sensor.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Atlas Scientific OEM sensors > + > +maintainers: > + - Matt Ranostay <matt.ranostay@xxxxxxxxxxxx> > + > +description: | > + Atlas Scientific OEM sensors connected via I2C > + > + Datasheets: > + http://www.atlas-scientific.com/_files/_datasheets/_oem/DO_oem_datasheet.pdf > + http://www.atlas-scientific.com/_files/_datasheets/_oem/EC_oem_datasheet.pdf > + http://www.atlas-scientific.com/_files/_datasheets/_oem/ORP_oem_datasheet.pdf > + http://www.atlas-scientific.com/_files/_datasheets/_oem/pH_oem_datasheet.pdf > + > +properties: > + compatible: > + enum: > + - atlas,do-sm > + - atlas,ec-sm > + - atlas,orp-sm > + - atlas,ph-sm > + > + reg: > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > +required: > + - compatible > + - reg > + > +additionalProperties: false > + > +examples: > + - | > + i2c { > + #address-cells = <1>; > + #size-cells = <0>; > + > + atlas@66 { > + compatible = "atlas,orp-sm"; > + reg = <0x66>; > + interrupt-parent = <&gpio1>; > + interrupts = <16 2>; > + }; > + };