| Message ID | 20200905173004.216081-7-jic23@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | dt-bindings:iio:adc: Another set of yaml conversions. | expand |
Hi Jonathan, On Sun, Sep 6, 2020 at 1:32 AM Jonathan Cameron <jic23@kernel.org> wrote: > > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > I changed the name to reflect a specific part in line with normal > naming conventions. If there is a particularly strong reason to > keep the wild cards let me know. Why do we have to change the file name of 27xx ? > > Otherwise this was a fairly simple conversion as part of converting > all the IIO bindings to yaml. Thanks for doing this for us. -Orson > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Cc: Baolin Wang <baolin.wang7@gmail.com> > Cc: Orson Zhai <orsonzhai@gmail.com> > Cc: Chunyan Zhang <zhang.lyra@gmail.com> > --- > .../bindings/iio/adc/sprd,sc2720-adc.yaml | 72 +++++++++++++++++++ > .../bindings/iio/adc/sprd,sc27xx-adc.txt | 40 ----------- > 2 files changed, 72 insertions(+), 40 deletions(-) > > diff --git a/Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml b/Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml > new file mode 100644 > index 000000000000..57df6439dd9d > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml > @@ -0,0 +1,72 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/iio/adc/sprd,sc2720-adc.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Spreadtrum SC27XX series PMICs ADC binding > + > +maintainers: > + - Baolin Wang <baolin.wang7@gmail.com> > + > +description: > + Supports the ADC found on these PMICs. > + > +properties: > + compatible: > + enum: > + - sprd,sc2720-adc > + - sprd,sc2721-adc > + - sprd,sc2723-adc > + - sprd,sc2730-adc > + - sprd,sc2731-adc > + > + reg: > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > + "#io-channel-cells": > + const: 1 > + > + hwlocks: > + maxItems: 1 > + > + nvmem-cells: > + maxItems: 2 > + > + nvmem-cell-names: > + items: > + - const: big_scale_calib > + - const: small_scale_calib > + > +required: > + - compatible > + - reg > + - interrupts > + - "#io-channel-cells" > + - hwlocks > + - nvmem-cells > + - nvmem-cell-names > + > +additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/interrupt-controller/irq.h> > + pmic { > + #address-cells = <1>; > + #size-cells = <0>; > + adc@480 { > + compatible = "sprd,sc2731-adc"; > + reg = <0x480>; > + interrupt-parent = <&sc2731_pmic>; > + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; > + #io-channel-cells = <1>; > + hwlocks = <&hwlock 4>; > + nvmem-cells = <&adc_big_scale>, <&adc_small_scale>; > + nvmem-cell-names = "big_scale_calib", "small_scale_calib"; > + }; > + }; > +... > diff --git a/Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt b/Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt > deleted file mode 100644 > index b4daa15dcf15..000000000000 > --- a/Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt > +++ /dev/null > @@ -1,40 +0,0 @@ > -Spreadtrum SC27XX series PMICs ADC binding > - > -Required properties: > -- compatible: Should be one of the following. > - "sprd,sc2720-adc" > - "sprd,sc2721-adc" > - "sprd,sc2723-adc" > - "sprd,sc2730-adc" > - "sprd,sc2731-adc" > -- reg: The address offset of ADC controller. > -- interrupt-parent: The interrupt controller. > -- interrupts: The interrupt number for the ADC device. > -- #io-channel-cells: Number of cells in an IIO specifier. > -- hwlocks: Reference to a phandle of a hwlock provider node. > -- nvmem-cells: A phandle to the calibration cells provided by eFuse device. > -- nvmem-cell-names: Should be "big_scale_calib", "small_scale_calib". > - > -Example: > - > - sc2731_pmic: pmic@0 { > - compatible = "sprd,sc2731"; > - reg = <0>; > - spi-max-frequency = <26000000>; > - interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; > - interrupt-controller; > - #interrupt-cells = <2>; > - #address-cells = <1>; > - #size-cells = <0>; > - > - pmic_adc: adc@480 { > - compatible = "sprd,sc2731-adc"; > - reg = <0x480>; > - interrupt-parent = <&sc2731_pmic>; > - interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; > - #io-channel-cells = <1>; > - hwlocks = <&hwlock 4>; > - nvmem-cells = <&adc_big_scale>, <&adc_small_scale>; > - nvmem-cell-names = "big_scale_calib", "small_scale_calib"; > - }; > - }; > -- > 2.28.0 >
On Tue, 8 Sep 2020 01:46:40 +0800 Orson Zhai <orsonzhai@gmail.com> wrote: > Hi Jonathan, > > On Sun, Sep 6, 2020 at 1:32 AM Jonathan Cameron <jic23@kernel.org> wrote: > > > > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > > > I changed the name to reflect a specific part in line with normal > > naming conventions. If there is a particularly strong reason to > > keep the wild cards let me know. > > Why do we have to change the file name of 27xx ? We don't have to, but generally we try to avoid using wild card naming. It is far too common for companies marketing departments or similar to decide to group incompatible parts. Basically picking a part number and saying 'and compatible' is much less likely to cause confusion than a wild card! If you feel strongly about it and can do a check of whether there are any incompatible parts or not covered by that wild card range, then I'm happy to change it back again whilst applying. Feel free to give a conditional Ack btw! Jonathan > > > > > Otherwise this was a fairly simple conversion as part of converting > > all the IIO bindings to yaml. > > Thanks for doing this for us. > > -Orson > > > > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > Cc: Baolin Wang <baolin.wang7@gmail.com> > > Cc: Orson Zhai <orsonzhai@gmail.com> > > Cc: Chunyan Zhang <zhang.lyra@gmail.com> > > --- > > .../bindings/iio/adc/sprd,sc2720-adc.yaml | 72 +++++++++++++++++++ > > .../bindings/iio/adc/sprd,sc27xx-adc.txt | 40 ----------- > > 2 files changed, 72 insertions(+), 40 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml b/Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml > > new file mode 100644 > > index 000000000000..57df6439dd9d > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml > > @@ -0,0 +1,72 @@ > > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > > +%YAML 1.2 > > +--- > > +$id: http://devicetree.org/schemas/iio/adc/sprd,sc2720-adc.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: Spreadtrum SC27XX series PMICs ADC binding > > + > > +maintainers: > > + - Baolin Wang <baolin.wang7@gmail.com> > > + > > +description: > > + Supports the ADC found on these PMICs. > > + > > +properties: > > + compatible: > > + enum: > > + - sprd,sc2720-adc > > + - sprd,sc2721-adc > > + - sprd,sc2723-adc > > + - sprd,sc2730-adc > > + - sprd,sc2731-adc > > + > > + reg: > > + maxItems: 1 > > + > > + interrupts: > > + maxItems: 1 > > + > > + "#io-channel-cells": > > + const: 1 > > + > > + hwlocks: > > + maxItems: 1 > > + > > + nvmem-cells: > > + maxItems: 2 > > + > > + nvmem-cell-names: > > + items: > > + - const: big_scale_calib > > + - const: small_scale_calib > > + > > +required: > > + - compatible > > + - reg > > + - interrupts > > + - "#io-channel-cells" > > + - hwlocks > > + - nvmem-cells > > + - nvmem-cell-names > > + > > +additionalProperties: false > > + > > +examples: > > + - | > > + #include <dt-bindings/interrupt-controller/irq.h> > > + pmic { > > + #address-cells = <1>; > > + #size-cells = <0>; > > + adc@480 { > > + compatible = "sprd,sc2731-adc"; > > + reg = <0x480>; > > + interrupt-parent = <&sc2731_pmic>; > > + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; > > + #io-channel-cells = <1>; > > + hwlocks = <&hwlock 4>; > > + nvmem-cells = <&adc_big_scale>, <&adc_small_scale>; > > + nvmem-cell-names = "big_scale_calib", "small_scale_calib"; > > + }; > > + }; > > +... > > diff --git a/Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt b/Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt > > deleted file mode 100644 > > index b4daa15dcf15..000000000000 > > --- a/Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt > > +++ /dev/null > > @@ -1,40 +0,0 @@ > > -Spreadtrum SC27XX series PMICs ADC binding > > - > > -Required properties: > > -- compatible: Should be one of the following. > > - "sprd,sc2720-adc" > > - "sprd,sc2721-adc" > > - "sprd,sc2723-adc" > > - "sprd,sc2730-adc" > > - "sprd,sc2731-adc" > > -- reg: The address offset of ADC controller. > > -- interrupt-parent: The interrupt controller. > > -- interrupts: The interrupt number for the ADC device. > > -- #io-channel-cells: Number of cells in an IIO specifier. > > -- hwlocks: Reference to a phandle of a hwlock provider node. > > -- nvmem-cells: A phandle to the calibration cells provided by eFuse device. > > -- nvmem-cell-names: Should be "big_scale_calib", "small_scale_calib". > > - > > -Example: > > - > > - sc2731_pmic: pmic@0 { > > - compatible = "sprd,sc2731"; > > - reg = <0>; > > - spi-max-frequency = <26000000>; > > - interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; > > - interrupt-controller; > > - #interrupt-cells = <2>; > > - #address-cells = <1>; > > - #size-cells = <0>; > > - > > - pmic_adc: adc@480 { > > - compatible = "sprd,sc2731-adc"; > > - reg = <0x480>; > > - interrupt-parent = <&sc2731_pmic>; > > - interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; > > - #io-channel-cells = <1>; > > - hwlocks = <&hwlock 4>; > > - nvmem-cells = <&adc_big_scale>, <&adc_small_scale>; > > - nvmem-cell-names = "big_scale_calib", "small_scale_calib"; > > - }; > > - }; > > -- > > 2.28.0 > >
On Tue, Sep 08, 2020 at 10:12:32AM +0100, Jonathan Cameron wrote: > On Tue, 8 Sep 2020 01:46:40 +0800 > Orson Zhai <orsonzhai@gmail.com> wrote: > > > Hi Jonathan, > > > > On Sun, Sep 6, 2020 at 1:32 AM Jonathan Cameron <jic23@kernel.org> wrote: > > > > > > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > > > > > I changed the name to reflect a specific part in line with normal > > > naming conventions. If there is a particularly strong reason to > > > keep the wild cards let me know. > > > > Why do we have to change the file name of 27xx ? > > We don't have to, but generally we try to avoid using wild > card naming. It is far too common for companies marketing departments > or similar to decide to group incompatible parts. Basically picking > a part number and saying 'and compatible' is much less likely to cause > confusion than a wild card! It makes much sense to me. > > If you feel strongly about it and can do a check of whether there > are any incompatible parts or not covered by that wild card range, then > I'm happy to change it back again whilst applying. > > Feel free to give a conditional Ack btw! Acked-by: Orson Zhai <orsonzhai@gmail.com> Thanks. Orson > > Jonathan > > > > > > > > > Otherwise this was a fairly simple conversion as part of converting > > > all the IIO bindings to yaml. > > > > Thanks for doing this for us. > > > > -Orson > > > > > > > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > > Cc: Baolin Wang <baolin.wang7@gmail.com> > > > Cc: Orson Zhai <orsonzhai@gmail.com> > > > Cc: Chunyan Zhang <zhang.lyra@gmail.com> > > > --- > > > .../bindings/iio/adc/sprd,sc2720-adc.yaml | 72 +++++++++++++++++++ > > > .../bindings/iio/adc/sprd,sc27xx-adc.txt | 40 ----------- > > > 2 files changed, 72 insertions(+), 40 deletions(-) > > > > > > diff --git a/Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml b/Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml > > > new file mode 100644 > > > index 000000000000..57df6439dd9d > > > --- /dev/null > > > +++ b/Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml > > > @@ -0,0 +1,72 @@ > > > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > > > +%YAML 1.2 > > > +--- > > > +$id: http://devicetree.org/schemas/iio/adc/sprd,sc2720-adc.yaml# > > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > > + > > > +title: Spreadtrum SC27XX series PMICs ADC binding > > > + > > > +maintainers: > > > + - Baolin Wang <baolin.wang7@gmail.com> > > > + > > > +description: > > > + Supports the ADC found on these PMICs. > > > + > > > +properties: > > > + compatible: > > > + enum: > > > + - sprd,sc2720-adc > > > + - sprd,sc2721-adc > > > + - sprd,sc2723-adc > > > + - sprd,sc2730-adc > > > + - sprd,sc2731-adc > > > + > > > + reg: > > > + maxItems: 1 > > > + > > > + interrupts: > > > + maxItems: 1 > > > + > > > + "#io-channel-cells": > > > + const: 1 > > > + > > > + hwlocks: > > > + maxItems: 1 > > > + > > > + nvmem-cells: > > > + maxItems: 2 > > > + > > > + nvmem-cell-names: > > > + items: > > > + - const: big_scale_calib > > > + - const: small_scale_calib > > > + > > > +required: > > > + - compatible > > > + - reg > > > + - interrupts > > > + - "#io-channel-cells" > > > + - hwlocks > > > + - nvmem-cells > > > + - nvmem-cell-names > > > + > > > +additionalProperties: false > > > + > > > +examples: > > > + - | > > > + #include <dt-bindings/interrupt-controller/irq.h> > > > + pmic { > > > + #address-cells = <1>; > > > + #size-cells = <0>; > > > + adc@480 { > > > + compatible = "sprd,sc2731-adc"; > > > + reg = <0x480>; > > > + interrupt-parent = <&sc2731_pmic>; > > > + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; > > > + #io-channel-cells = <1>; > > > + hwlocks = <&hwlock 4>; > > > + nvmem-cells = <&adc_big_scale>, <&adc_small_scale>; > > > + nvmem-cell-names = "big_scale_calib", "small_scale_calib"; > > > + }; > > > + }; > > > +... > > > diff --git a/Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt b/Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt > > > deleted file mode 100644 > > > index b4daa15dcf15..000000000000 > > > --- a/Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt > > > +++ /dev/null > > > @@ -1,40 +0,0 @@ > > > -Spreadtrum SC27XX series PMICs ADC binding > > > - > > > -Required properties: > > > -- compatible: Should be one of the following. > > > - "sprd,sc2720-adc" > > > - "sprd,sc2721-adc" > > > - "sprd,sc2723-adc" > > > - "sprd,sc2730-adc" > > > - "sprd,sc2731-adc" > > > -- reg: The address offset of ADC controller. > > > -- interrupt-parent: The interrupt controller. > > > -- interrupts: The interrupt number for the ADC device. > > > -- #io-channel-cells: Number of cells in an IIO specifier. > > > -- hwlocks: Reference to a phandle of a hwlock provider node. > > > -- nvmem-cells: A phandle to the calibration cells provided by eFuse device. > > > -- nvmem-cell-names: Should be "big_scale_calib", "small_scale_calib". > > > - > > > -Example: > > > - > > > - sc2731_pmic: pmic@0 { > > > - compatible = "sprd,sc2731"; > > > - reg = <0>; > > > - spi-max-frequency = <26000000>; > > > - interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; > > > - interrupt-controller; > > > - #interrupt-cells = <2>; > > > - #address-cells = <1>; > > > - #size-cells = <0>; > > > - > > > - pmic_adc: adc@480 { > > > - compatible = "sprd,sc2731-adc"; > > > - reg = <0x480>; > > > - interrupt-parent = <&sc2731_pmic>; > > > - interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; > > > - #io-channel-cells = <1>; > > > - hwlocks = <&hwlock 4>; > > > - nvmem-cells = <&adc_big_scale>, <&adc_small_scale>; > > > - nvmem-cell-names = "big_scale_calib", "small_scale_calib"; > > > - }; > > > - }; > > > -- > > > 2.28.0 > > > > >
diff --git a/Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml b/Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml new file mode 100644 index 000000000000..57df6439dd9d --- /dev/null +++ b/Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml @@ -0,0 +1,72 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/adc/sprd,sc2720-adc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Spreadtrum SC27XX series PMICs ADC binding + +maintainers: + - Baolin Wang <baolin.wang7@gmail.com> + +description: + Supports the ADC found on these PMICs. + +properties: + compatible: + enum: + - sprd,sc2720-adc + - sprd,sc2721-adc + - sprd,sc2723-adc + - sprd,sc2730-adc + - sprd,sc2731-adc + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + "#io-channel-cells": + const: 1 + + hwlocks: + maxItems: 1 + + nvmem-cells: + maxItems: 2 + + nvmem-cell-names: + items: + - const: big_scale_calib + - const: small_scale_calib + +required: + - compatible + - reg + - interrupts + - "#io-channel-cells" + - hwlocks + - nvmem-cells + - nvmem-cell-names + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + pmic { + #address-cells = <1>; + #size-cells = <0>; + adc@480 { + compatible = "sprd,sc2731-adc"; + reg = <0x480>; + interrupt-parent = <&sc2731_pmic>; + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; + #io-channel-cells = <1>; + hwlocks = <&hwlock 4>; + nvmem-cells = <&adc_big_scale>, <&adc_small_scale>; + nvmem-cell-names = "big_scale_calib", "small_scale_calib"; + }; + }; +... diff --git a/Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt b/Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt deleted file mode 100644 index b4daa15dcf15..000000000000 --- a/Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt +++ /dev/null @@ -1,40 +0,0 @@ -Spreadtrum SC27XX series PMICs ADC binding - -Required properties: -- compatible: Should be one of the following. - "sprd,sc2720-adc" - "sprd,sc2721-adc" - "sprd,sc2723-adc" - "sprd,sc2730-adc" - "sprd,sc2731-adc" -- reg: The address offset of ADC controller. -- interrupt-parent: The interrupt controller. -- interrupts: The interrupt number for the ADC device. -- #io-channel-cells: Number of cells in an IIO specifier. -- hwlocks: Reference to a phandle of a hwlock provider node. -- nvmem-cells: A phandle to the calibration cells provided by eFuse device. -- nvmem-cell-names: Should be "big_scale_calib", "small_scale_calib". - -Example: - - sc2731_pmic: pmic@0 { - compatible = "sprd,sc2731"; - reg = <0>; - spi-max-frequency = <26000000>; - interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; - interrupt-controller; - #interrupt-cells = <2>; - #address-cells = <1>; - #size-cells = <0>; - - pmic_adc: adc@480 { - compatible = "sprd,sc2731-adc"; - reg = <0x480>; - interrupt-parent = <&sc2731_pmic>; - interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; - #io-channel-cells = <1>; - hwlocks = <&hwlock 4>; - nvmem-cells = <&adc_big_scale>, <&adc_small_scale>; - nvmem-cell-names = "big_scale_calib", "small_scale_calib"; - }; - };