| Message ID | 20200114022348.8676-4-matt.ranostay@konsulko.com |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | None | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | "total: 0 errors, 7 warnings, 34 lines checked" |
On Tue, 14 Jan 2020 04:23:48 +0200 Matt Ranostay <matt.ranostay@konsulko.com> 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.txt > > Cc: devicetree@vger.kernel.org > Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> No chance of a yaml conversion whilst you are at it? Maybe dt maintainers will take the view this is step in the right direction and let this go, but I will want an Ack for that. > --- > .../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.txt | 34 +++++++++++++++++++ > 4 files changed, 34 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.txt > > 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.txt b/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.txt > new file mode 100644 > index 000000000000..518327dc71e2 > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.txt > @@ -0,0 +1,34 @@ > +* Atlas Scientific OEM sensors > + > +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 > + > +Required properties: > + > + - compatible: must be one of : > + "atlas,do-sm", > + "atlas,ec-sm", > + "atlas,orp-sm", > + "atlas,ph-sm" > + > + - reg: the I2C address of the sensor > + > +Optional properties: > + > + - 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>; > +};
On Thu, Jan 16, 2020 at 06:21:24PM +0000, Jonathan Cameron wrote: > On Tue, 14 Jan 2020 04:23:48 +0200 > Matt Ranostay <matt.ranostay@konsulko.com> 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.txt > > > > Cc: devicetree@vger.kernel.org > > Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> > > No chance of a yaml conversion whilst you are at it? I asked for that on v1. > Maybe dt maintainers will take the view this is step in the right direction and > let this go, but I will want an Ack for that. When I can get 4 for the price of 1, I'll take the conversion. :) > > --- > > .../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.txt | 34 +++++++++++++++++++ > > 4 files changed, 34 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.txt
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.txt b/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.txt new file mode 100644 index 000000000000..518327dc71e2 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.txt @@ -0,0 +1,34 @@ +* Atlas Scientific OEM sensors + +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 + +Required properties: + + - compatible: must be one of : + "atlas,do-sm", + "atlas,ec-sm", + "atlas,orp-sm", + "atlas,ph-sm" + + - reg: the I2C address of the sensor + +Optional properties: + + - 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>; +};
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.txt Cc: devicetree@vger.kernel.org Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> --- .../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.txt | 34 +++++++++++++++++++ 4 files changed, 34 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.txt