dt-bindings: iio: adc: convert rockchip saradc bindings to yaml
Subsystems (3)
PATCH v2 1/3 dt-bindings: iio: adc: convert rockchip saradc bindings to yaml
Current dts files with 'saradc' nodes are manually verified. In order to automate this process rockchip-saradc.txt has to be converted to yaml.
---
Changes v2:
Add reviewed by
Fix irq.h already included in arm-gic.h
--- .../bindings/iio/adc/rockchip-saradc.txt | 37 ---------- .../bindings/iio/adc/rockchip-saradc.yaml | 78 ++++++++++++++++++++++ 2 files changed, 78 insertions(+), 37 deletions(-) delete mode 100644 Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml
Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt deleted +0 -37
@@ -1,37 +0,0 @@ -Rockchip Successive Approximation Register (SAR) A/D Converter bindings - -Required properties: -- compatible: should be "rockchip,<name>-saradc" or "rockchip,rk3066-tsadc" - - "rockchip,saradc": for rk3188, rk3288 - - "rockchip,rk3066-tsadc": for rk3036 - - "rockchip,rk3328-saradc", "rockchip,rk3399-saradc": for rk3328 - - "rockchip,rk3399-saradc": for rk3399 - - "rockchip,rv1108-saradc", "rockchip,rk3399-saradc": for rv1108 - -- reg: physical base address of the controller and length of memory mapped - region. -- interrupts: The interrupt number to the cpu. The interrupt specifier format - depends on the interrupt controller. -- clocks: Must contain an entry for each entry in clock-names. -- clock-names: Shall be "saradc" for the converter-clock, and "apb_pclk" for - the peripheral clock. -- vref-supply: The regulator supply ADC reference voltage. -- #io-channel-cells: Should be 1, see ../iio-bindings.txt - -Optional properties: -- resets: Must contain an entry for each entry in reset-names if need support - this option. See ../reset/reset.txt for details. -- reset-names: Must include the name "saradc-apb". - -Example: - saradc: saradc@2006c000 { - compatible = "rockchip,saradc"; - reg = <0x2006c000 0x100>; - interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>; - clock-names = "saradc", "apb_pclk"; - resets = <&cru SRST_SARADC>; - reset-names = "saradc-apb"; - #io-channel-cells = <1>; - vref-supply = <&vcc18>; - };
Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml new file +78 -0
78 lines not on this page · raw message
Signature · 1 line
2.11.0
PATCH v2 2/3 dt-bindings: iio: adc: rockchip-saradc: add description for rk3308
The description below is already in use for rk3308.dtsi, but was somehow never added to a document, so add "rockchip,rk3308-saradc", "rockchip,rk3399-saradc" for saradc nodes on a rk3308 platform to rockchip-saradc.yaml.
---
Changes v2:
Add acked by
--- Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml +1 -0
@@ -17,6 +17,7 @@ properties: - const: rockchip,rk3399-saradc - items: - enum: + - rockchip,rk3308-saradc - rockchip,rk3328-saradc - rockchip,rv1108-saradc - const: rockchip,rk3399-saradc
Signature · 1 line
2.11.0
PATCH v2 3/3 dt-bindings: iio: adc: rockchip-saradc: add description for px30
In reply to Johan JonkerThe description below is already in use for px30.dtsi, but was somehow never added to a document, so add "rockchip,px30-saradc", "rockchip,rk3399-saradc" for saradc nodes on a px30 platform to rockchip-saradc.yaml.
---
Changes v2:
Add acked by
--- Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml +1 -0
@@ -17,6 +17,7 @@ properties: - const: rockchip,rk3399-saradc - items: - enum: + - rockchip,px30-saradc - rockchip,rk3308-saradc - rockchip,rk3328-saradc - rockchip,rv1108-saradc
Signature · 1 line
2.11.0
Jonathan Cameron
maintainerQuoted 6 lines · On Sat, 4 Apr 2020 12:27:28 +0200 Johan Jonker…
Current dts files with 'saradc' nodes are manually verified. In order to automate this process rockchip-saradc.txt has to be converted to yaml.
Signed-off-by Johan Jonker <[email protected]>Reviewed-by Rob Herring <[email protected]>
Hi Johan
As I'd already applied these I'd have preferred a fix patch and I'm not actually sure it's really worth making the change. I don't think we have any rules about minimal includes or anything in DT bindings. Was there an error or warning as a result of this?
Still as I hadn't pushed out as non rebasing yet I've picked this version up and dropped the previous.
Thanks,
Jonathan
Quoted 138 lines
---
Changes v2:
Add reviewed by
Fixirq.halready included inarm-gic.h--- .../bindings/iio/adc/rockchip-saradc.txt | 37 ---------- .../bindings/iio/adc/rockchip-saradc.yaml | 78 ++++++++++++++++++++++ 2 files changed, 78 insertions(+), 37 deletions(-) delete mode 100644 Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yamlDocumentation/devicetree/bindings/iio/adc/rockchip-saradc.txt deleted +0
-37@@ -1,37 +0,0 @@ -Rockchip Successive Approximation Register (SAR) A/D Converter bindings - -Required properties: -- compatible: should be "rockchip,<name>-saradc" or "rockchip,rk3066-tsadc" - - "rockchip,saradc": for rk3188, rk3288 - - "rockchip,rk3066-tsadc": for rk3036 - - "rockchip,rk3328-saradc", "rockchip,rk3399-saradc": for rk3328 - - "rockchip,rk3399-saradc": for rk3399 - - "rockchip,rv1108-saradc", "rockchip,rk3399-saradc": for rv1108 - -- reg: physical base address of the controller and length of memory mapped - region. -- interrupts: The interrupt number to the cpu. The interrupt specifier format - depends on the interrupt controller. -- clocks: Must contain an entry for each entry in clock-names. -- clock-names: Shall be "saradc" for the converter-clock, and "apb_pclk" for - the peripheral clock. -- vref-supply: The regulator supply ADC reference voltage. -- #io-channel-cells: Should be 1, see ../iio-bindings.txt - -Optional properties: -- resets: Must contain an entry for each entry in reset-names if need support - this option. See ../reset/reset.txt for details. -- reset-names: Must include the name "saradc-apb". - -Example: - saradc: saradc@2006c000 { - compatible = "rockchip,saradc"; - reg = <0x2006c000 0x100>; - interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>; - clock-names = "saradc", "apb_pclk"; - resets = <&cru SRST_SARADC>; - reset-names = "saradc-apb"; - #io-channel-cells = <1>; - vref-supply = <&vcc18>; - };Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml new file +78
-0@@ -0,0 +1,78 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/adc/rockchip-saradc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip Successive Approximation Register (SAR) A/D Converter + +maintainers: + - Heiko Stuebner <[email protected]> + +properties: + compatible: + oneOf: + - const: rockchip,saradc + - const: rockchip,rk3066-tsadc + - const: rockchip,rk3399-saradc + - items: + - enum: + - rockchip,rk3328-saradc + - rockchip,rv1108-saradc + - const: rockchip,rk3399-saradc + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: converter clock + - description: peripheral clock + + clock-names: + items: + - const: saradc + - const: apb_pclk + + resets: + maxItems: 1 + + reset-names: + const: saradc-apb + + vref-supply: + description: + The regulator supply for the ADC reference voltage. + + "#io-channel-cells": + const: 1 + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - vref-supply + - "#io-channel-cells" + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/rk3288-cru.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + saradc: saradc@2006c000 { + compatible = "rockchip,saradc"; + reg = <0x2006c000 0x100>; + interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>; + clock-names = "saradc", "apb_pclk"; + resets = <&cru SRST_SARADC>; + reset-names = "saradc-apb"; + vref-supply = <&vcc18>; + #io-channel-cells = <1>; + };
Hi Jonathan,
Originally I just followed 'rk3288.dtsi' till I saw someone posting a patch with only 'arm-gic.h' included that made me to have a closer look at it.
Due to the #ifndef construction it doesn't rise any warnings I think. Apply the version that fits best.
Kind regards,
Johan Jonker
#ifndef _DT_BINDINGS_INTERRUPT_CONTROLLER_IRQ_H
#define _DT_BINDINGS_INTERRUPT_CONTROLLER_IRQ_H
[..]
#endif
Something else...
With 2 examples it gives a warning that 2 identical defines are used. Yaml doesn't separately compile the examples. Must use the same SoC.
This doesn't work. One example for rk3288 and one for rk3399. examples:
- |
#include <dt-bindings/clock/rk3288-cru.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
[..]
- |
#include <dt-bindings/clock/rk3399-cru.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>[..]
From 'rk3288.dtsi':
Quoted 17 lines
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
#include <
dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/pinctrl/rockchip.h> #include <dt-bindings/clock/rk3288-cru.h> #include <dt-bindings/power/rk3288-power.h> #include <dt-bindings/thermal/thermal.h> #include <dt-bindings/power/rk3288-power.h> #include <dt-bindings/soc/rockchip,boot-mode.h>/ { #address-cells = <2>; #size-cells = <2>; compatible = "rockchip,rk3288";
[..]
Quoted 7 lines · Jonathan Cameron
Quoted 4 lines · On Sat, 4 Apr 2020 12:27:28 +0200 Johan Jonker <[email protected]> wrote:
Current dts files with 'saradc' nodes are manually verified. In order to automate this process rockchip-saradc.txt has to be converted to yaml.
Quoted 5 lines
Quoted 2 lines
Signed-off-by Johan Jonker <[email protected]>Reviewed-by Rob Herring <[email protected]>Hi Johan
As I'd already applied these I'd have preferred a fix patch and I'm
not actually
Quoted 5 lines
sure it's really worth making the change. I don't think we have any rules about minimal includes or anything in DT bindings. Was there an error or warning as a result of this?
Still as I hadn't pushed out as non rebasing yet I've picked this
version up
Quoted 13 lines
and dropped the previous.
Thanks,
Jonathan
Quoted 7 lines
---
Changes v2:
Add reviewed by
Fixirq.halready included inarm-gic.h--- .../bindings/iio/adc/rockchip-saradc.txt | 37 ---------- .../bindings/iio/adc/rockchip-saradc.yaml | 78
++++++++++++++++++++++
Quoted 2 lines
Quoted 2 lines
2 files changed, 78 insertions(+), 37 deletions(-) delete mode 100644
Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt
Quoted 1 line
Quoted 1 line
create mode 100644
Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml
Quoted 2 lines
Quoted 2 lines
diff --git
a/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt b/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt
Quoted 3 lines
Quoted 3 lines
deleted file mode 100644
index c2c50b598..000000000
---a/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt
[..]
Quoted 1 line
Quoted 1 line
diff --git
a/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml b/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml
Quoted 10 lines
Quoted 10 lines
new file mode 100644
index 000000000..9b9882323Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml new file +5
-0@@ -0,0 +1,78 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/adc/rockchip-saradc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml#
[..]
Quoted 17 lines
Quoted 16 lines
Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml new file +16
-0+ +examples: + - | + #include <dt-bindings/clock/rk3288-cru.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + saradc: saradc@2006c000 { + compatible = "rockchip,saradc"; + reg = <0x2006c000 0x100>; + interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>; + clock-names = "saradc", "apb_pclk"; + resets = <&cru SRST_SARADC>; + reset-names = "saradc-apb"; + vref-supply = <&vcc18>; + #io-channel-cells = <1>; + };