| Message ID | 20240227004414.841391-1-andrew@codeconstruct.com.au |
|---|---|
| State | New |
| Headers | show |
| Series | [v4] dt-bindings: gpio: aspeed,ast2400-gpio: Convert to DT schema | expand |
On Tue, 27 Feb 2024 11:14:14 +1030, Andrew Jeffery wrote: > Squash warnings such as: > > ``` > arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-galaxy100.dtb: /ahb/apb@1e600000/gpio@1e780000: failed to match any schema with compatible: ['aspeed,ast2400-gpio'] > ``` > > Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au> > --- > v4: Add constraints for gpio-line-names, ngpios as requested by Krzysztof: > https://lore.kernel.org/all/458becdb-fb1e-4808-87b6-3037ec945647@linaro.org/ > > Add more examples to exercise constraints. > > v3: https://lore.kernel.org/all/20240226051645.414935-1-andrew@codeconstruct.com.au/ > > Base on v6.8-rc6, fix yamllint warning > > Rob's bot picked the missing `#interrupt-cells` in the example on v2[1]. The > patch was based on v6.8-rc1, and going back over my shell history I missed > the following output from `make dt_binding_check`: > > ``` > ... > LINT Documentation/devicetree/bindings > usage: yamllint [-h] [-] [-c CONFIG_FILE | -d CONFIG_DATA] [--list-files] [-f {parsable,standard,colored,github,auto}] [-s] [--no-warnings] [-v] [FILE_OR_DIR ...] > yamllint: error: one of the arguments FILE_OR_DIR - is required > ... > ``` > > I've rebased on v6.8-rc6 and no-longer see the issue with the invocation > of `yamllint`. > > [1]: https://lore.kernel.org/all/170892197611.2260479.15343562563553959436.robh@kernel.org/ > > v2: https://lore.kernel.org/all/20240226031951.284847-1-andrew@codeconstruct.com.au/ > > Address feedback from Krzysztof: > https://lore.kernel.org/all/0d1dd262-b6dd-4d71-9239-8b0aec8cceff@linaro.org/ > > v1: https://lore.kernel.org/all/20240220052918.742793-1-andrew@codeconstruct.com.au/ > > .../bindings/gpio/aspeed,ast2400-gpio.yaml | 149 ++++++++++++++++++ > .../devicetree/bindings/gpio/gpio-aspeed.txt | 39 ----- > 2 files changed, 149 insertions(+), 39 deletions(-) > create mode 100644 Documentation/devicetree/bindings/gpio/aspeed,ast2400-gpio.yaml > delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-aspeed.txt > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: In file included from Documentation/devicetree/bindings/gpio/aspeed,ast2400-gpio.example.dts:91: ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:14: warning: "ASPEED_CLK_GATE_LCLK" redefined 14 | #define ASPEED_CLK_GATE_LCLK 6 | In file included from Documentation/devicetree/bindings/gpio/aspeed,ast2400-gpio.example.dts:56: ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:14: note: this is the location of the previous definition 14 | #define ASPEED_CLK_GATE_LCLK 8 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:15: warning: "ASPEED_CLK_GATE_LHCCLK" redefined 15 | #define ASPEED_CLK_GATE_LHCCLK 7 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:29: note: this is the location of the previous definition 29 | #define ASPEED_CLK_GATE_LHCCLK 23 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:17: warning: "ASPEED_CLK_GATE_D1CLK" redefined 17 | #define ASPEED_CLK_GATE_D1CLK 8 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:16: note: this is the location of the previous definition 16 | #define ASPEED_CLK_GATE_D1CLK 10 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:18: warning: "ASPEED_CLK_GATE_YCLK" redefined 18 | #define ASPEED_CLK_GATE_YCLK 9 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:17: note: this is the location of the previous definition 17 | #define ASPEED_CLK_GATE_YCLK 11 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:23: warning: "ASPEED_CLK_GATE_ESPICLK" redefined 23 | #define ASPEED_CLK_GATE_ESPICLK 12 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:22: note: this is the location of the previous definition 22 | #define ASPEED_CLK_GATE_ESPICLK 16 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:25: warning: "ASPEED_CLK_GATE_USBUHCICLK" redefined 25 | #define ASPEED_CLK_GATE_USBUHCICLK 13 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:15: note: this is the location of the previous definition 15 | #define ASPEED_CLK_GATE_USBUHCICLK 9 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:26: warning: "ASPEED_CLK_GATE_USBPORT1CLK" redefined 26 | #define ASPEED_CLK_GATE_USBPORT1CLK 14 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:18: note: this is the location of the previous definition 18 | #define ASPEED_CLK_GATE_USBPORT1CLK 12 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:27: warning: "ASPEED_CLK_GATE_USBPORT2CLK" redefined 27 | #define ASPEED_CLK_GATE_USBPORT2CLK 15 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:13: note: this is the location of the previous definition 13 | #define ASPEED_CLK_GATE_USBPORT2CLK 7 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:29: warning: "ASPEED_CLK_GATE_RSACLK" redefined 29 | #define ASPEED_CLK_GATE_RSACLK 16 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:25: note: this is the location of the previous definition 25 | #define ASPEED_CLK_GATE_RSACLK 19 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:32: warning: "ASPEED_CLK_GATE_MAC1CLK" redefined 32 | #define ASPEED_CLK_GATE_MAC1CLK 18 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:23: note: this is the location of the previous definition 23 | #define ASPEED_CLK_GATE_MAC1CLK 17 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:33: warning: "ASPEED_CLK_GATE_MAC2CLK" redefined 33 | #define ASPEED_CLK_GATE_MAC2CLK 19 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:24: note: this is the location of the previous definition 24 | #define ASPEED_CLK_GATE_MAC2CLK 18 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:37: warning: "ASPEED_CLK_GATE_UART1CLK" redefined 37 | #define ASPEED_CLK_GATE_UART1CLK 22 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:19: note: this is the location of the previous definition 19 | #define ASPEED_CLK_GATE_UART1CLK 13 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:38: warning: "ASPEED_CLK_GATE_UART2CLK" redefined 38 | #define ASPEED_CLK_GATE_UART2CLK 23 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:20: note: this is the location of the previous definition 20 | #define ASPEED_CLK_GATE_UART2CLK 14 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:39: warning: "ASPEED_CLK_GATE_UART3CLK" redefined 39 | #define ASPEED_CLK_GATE_UART3CLK 24 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:26: note: this is the location of the previous definition 26 | #define ASPEED_CLK_GATE_UART3CLK 20 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:40: warning: "ASPEED_CLK_GATE_UART4CLK" redefined 40 | #define ASPEED_CLK_GATE_UART4CLK 25 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:27: note: this is the location of the previous definition 27 | #define ASPEED_CLK_GATE_UART4CLK 21 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:41: warning: "ASPEED_CLK_GATE_UART5CLK" redefined 41 | #define ASPEED_CLK_GATE_UART5CLK 26 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:21: note: this is the location of the previous definition 21 | #define ASPEED_CLK_GATE_UART5CLK 15 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:51: warning: "ASPEED_CLK_GATE_SDCLK" redefined 51 | #define ASPEED_CLK_GATE_SDCLK 35 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:28: note: this is the location of the previous definition 28 | #define ASPEED_CLK_GATE_SDCLK 22 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:63: warning: "ASPEED_CLK_HPLL" redefined 63 | #define ASPEED_CLK_HPLL 46 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:30: note: this is the location of the previous definition 30 | #define ASPEED_CLK_HPLL 24 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:64: warning: "ASPEED_CLK_MPLL" redefined 64 | #define ASPEED_CLK_MPLL 47 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:40: note: this is the location of the previous definition 40 | #define ASPEED_CLK_MPLL 34 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:68: warning: "ASPEED_CLK_AHB" redefined 68 | #define ASPEED_CLK_AHB 51 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:31: note: this is the location of the previous definition 31 | #define ASPEED_CLK_AHB 25 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:71: warning: "ASPEED_CLK_BCLK" redefined 71 | #define ASPEED_CLK_BCLK 54 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:39: note: this is the location of the previous definition 39 | #define ASPEED_CLK_BCLK 33 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:74: warning: "ASPEED_CLK_LHCLK" redefined 74 | #define ASPEED_CLK_LHCLK 57 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:37: note: this is the location of the previous definition 37 | #define ASPEED_CLK_LHCLK 31 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:75: warning: "ASPEED_CLK_UART" redefined 75 | #define ASPEED_CLK_UART 58 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:33: note: this is the location of the previous definition 33 | #define ASPEED_CLK_UART 27 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:77: warning: "ASPEED_CLK_SDIO" redefined 77 | #define ASPEED_CLK_SDIO 60 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:34: note: this is the location of the previous definition 34 | #define ASPEED_CLK_SDIO 28 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:79: warning: "ASPEED_CLK_ECLK" redefined 79 | #define ASPEED_CLK_ECLK 62 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:35: note: this is the location of the previous definition 35 | #define ASPEED_CLK_ECLK 29 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:80: warning: "ASPEED_CLK_ECLK_MUX" redefined 80 | #define ASPEED_CLK_ECLK_MUX 63 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:36: note: this is the location of the previous definition 36 | #define ASPEED_CLK_ECLK_MUX 30 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:84: warning: "ASPEED_CLK_MAC1RCLK" redefined 84 | #define ASPEED_CLK_MAC1RCLK 67 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:42: note: this is the location of the previous definition 42 | #define ASPEED_CLK_MAC1RCLK 36 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:85: warning: "ASPEED_CLK_MAC2RCLK" redefined 85 | #define ASPEED_CLK_MAC2RCLK 68 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:43: note: this is the location of the previous definition 43 | #define ASPEED_CLK_MAC2RCLK 37 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:91: warning: "ASPEED_RESET_ADC" redefined 91 | #define ASPEED_RESET_ADC 55 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:47: note: this is the location of the previous definition 47 | #define ASPEED_RESET_ADC 2 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:106: warning: "ASPEED_RESET_PWM" redefined 106 | #define ASPEED_RESET_PWM 37 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:50: note: this is the location of the previous definition 50 | #define ASPEED_RESET_PWM 5 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:107: warning: "ASPEED_RESET_PECI" redefined 107 | #define ASPEED_RESET_PECI 36 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:51: note: this is the location of the previous definition 51 | #define ASPEED_RESET_PECI 6 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:109: warning: "ASPEED_RESET_I2C" redefined 109 | #define ASPEED_RESET_I2C 34 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:52: note: this is the location of the previous definition 52 | #define ASPEED_RESET_I2C 7 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:119: warning: "ASPEED_RESET_JTAG_MASTER" redefined 119 | #define ASPEED_RESET_JTAG_MASTER 22 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:48: note: this is the location of the previous definition 48 | #define ASPEED_RESET_JTAG_MASTER 3 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:125: warning: "ASPEED_RESET_HACE" redefined 125 | #define ASPEED_RESET_HACE 4 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:55: note: this is the location of the previous definition 55 | #define ASPEED_RESET_HACE 10 | ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:126: warning: "ASPEED_RESET_AHB" redefined 126 | #define ASPEED_RESET_AHB 1 | ./scripts/dtc/include-prefixes/dt-bindings/clock/aspeed-clock.h:53: note: this is the location of the previous definition 53 | #define ASPEED_RESET_AHB 8 | doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20240227004414.841391-1-andrew@codeconstruct.com.au The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
On Mon, Feb 26, 2024 at 08:16:43PM -0600, Rob Herring wrote: > > On Tue, 27 Feb 2024 11:14:14 +1030, Andrew Jeffery wrote: > > Squash warnings such as: > > > > ``` > > arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-galaxy100.dtb: /ahb/apb@1e600000/gpio@1e780000: failed to match any schema with compatible: ['aspeed,ast2400-gpio'] > > ``` > > > > Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au> > > --- > > v4: Add constraints for gpio-line-names, ngpios as requested by Krzysztof: > > https://lore.kernel.org/all/458becdb-fb1e-4808-87b6-3037ec945647@linaro.org/ > > > > Add more examples to exercise constraints. > > > > v3: https://lore.kernel.org/all/20240226051645.414935-1-andrew@codeconstruct.com.au/ > > > > Base on v6.8-rc6, fix yamllint warning > > > > Rob's bot picked the missing `#interrupt-cells` in the example on v2[1]. The > > patch was based on v6.8-rc1, and going back over my shell history I missed > > the following output from `make dt_binding_check`: > > > > ``` > > ... > > LINT Documentation/devicetree/bindings > > usage: yamllint [-h] [-] [-c CONFIG_FILE | -d CONFIG_DATA] [--list-files] [-f {parsable,standard,colored,github,auto}] [-s] [--no-warnings] [-v] [FILE_OR_DIR ...] > > yamllint: error: one of the arguments FILE_OR_DIR - is required > > ... > > ``` > > > > I've rebased on v6.8-rc6 and no-longer see the issue with the invocation > > of `yamllint`. > > > > [1]: https://lore.kernel.org/all/170892197611.2260479.15343562563553959436.robh@kernel.org/ > > > > v2: https://lore.kernel.org/all/20240226031951.284847-1-andrew@codeconstruct.com.au/ > > > > Address feedback from Krzysztof: > > https://lore.kernel.org/all/0d1dd262-b6dd-4d71-9239-8b0aec8cceff@linaro.org/ > > > > v1: https://lore.kernel.org/all/20240220052918.742793-1-andrew@codeconstruct.com.au/ > > > > .../bindings/gpio/aspeed,ast2400-gpio.yaml | 149 ++++++++++++++++++ > > .../devicetree/bindings/gpio/gpio-aspeed.txt | 39 ----- > > 2 files changed, 149 insertions(+), 39 deletions(-) > > create mode 100644 Documentation/devicetree/bindings/gpio/aspeed,ast2400-gpio.yaml > > delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-aspeed.txt > > > > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' > on your patch (DT_CHECKER_FLAGS is new in v5.13): > > yamllint warnings/errors: > > dtschema/dtc warnings/errors: > In file included from Documentation/devicetree/bindings/gpio/aspeed,ast2400-gpio.example.dts:91: > ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:14: warning: "ASPEED_CLK_GATE_LCLK" redefined > 14 | #define ASPEED_CLK_GATE_LCLK 6 The examples aren't isolated from each other, so you can't have conflicting includes. You'll have to drop some of the examples or drop their use of the conflicting include. Rob
On Mon, 2024-02-26 at 21:40 -0600, Rob Herring wrote: > On Mon, Feb 26, 2024 at 08:16:43PM -0600, Rob Herring wrote: > > > > On Tue, 27 Feb 2024 11:14:14 +1030, Andrew Jeffery wrote: > > > Squash warnings such as: > > > > > > ``` > > > arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-galaxy100.dtb: /ahb/apb@1e600000/gpio@1e780000: failed to match any schema with compatible: ['aspeed,ast2400-gpio'] > > > ``` > > > > > > Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au> > > > --- > > > v4: Add constraints for gpio-line-names, ngpios as requested by Krzysztof: > > > https://lore.kernel.org/all/458becdb-fb1e-4808-87b6-3037ec945647@linaro.org/ > > > > > > Add more examples to exercise constraints. > > > > > > v3: https://lore.kernel.org/all/20240226051645.414935-1-andrew@codeconstruct.com.au/ > > > > > > Base on v6.8-rc6, fix yamllint warning > > > > > > Rob's bot picked the missing `#interrupt-cells` in the example on v2[1]. The > > > patch was based on v6.8-rc1, and going back over my shell history I missed > > > the following output from `make dt_binding_check`: > > > > > > ``` > > > ... > > > LINT Documentation/devicetree/bindings > > > usage: yamllint [-h] [-] [-c CONFIG_FILE | -d CONFIG_DATA] [--list-files] [-f {parsable,standard,colored,github,auto}] [-s] [--no-warnings] [-v] [FILE_OR_DIR ...] > > > yamllint: error: one of the arguments FILE_OR_DIR - is required > > > ... > > > ``` > > > > > > I've rebased on v6.8-rc6 and no-longer see the issue with the invocation > > > of `yamllint`. > > > > > > [1]: https://lore.kernel.org/all/170892197611.2260479.15343562563553959436.robh@kernel.org/ > > > > > > v2: https://lore.kernel.org/all/20240226031951.284847-1-andrew@codeconstruct.com.au/ > > > > > > Address feedback from Krzysztof: > > > https://lore.kernel.org/all/0d1dd262-b6dd-4d71-9239-8b0aec8cceff@linaro.org/ > > > > > > v1: https://lore.kernel.org/all/20240220052918.742793-1-andrew@codeconstruct.com.au/ > > > > > > .../bindings/gpio/aspeed,ast2400-gpio.yaml | 149 ++++++++++++++++++ > > > .../devicetree/bindings/gpio/gpio-aspeed.txt | 39 ----- > > > 2 files changed, 149 insertions(+), 39 deletions(-) > > > create mode 100644 Documentation/devicetree/bindings/gpio/aspeed,ast2400-gpio.yaml > > > delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-aspeed.txt > > > > > > > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' > > on your patch (DT_CHECKER_FLAGS is new in v5.13): > > > > yamllint warnings/errors: > > > > dtschema/dtc warnings/errors: > > In file included from Documentation/devicetree/bindings/gpio/aspeed,ast2400-gpio.example.dts:91: > > ./scripts/dtc/include-prefixes/dt-bindings/clock/ast2600-clock.h:14: warning: "ASPEED_CLK_GATE_LCLK" redefined > > 14 | #define ASPEED_CLK_GATE_LCLK 6 > > The examples aren't isolated from each other, so you can't have > conflicting includes. You'll have to drop some of the examples or drop > their use of the conflicting include. Thanks. I've reworked the patch to avoid use of the conflicting includes. I'm also sorting myself out to avoid repeating the process flaw of failing to run `make dt_binding_check` on the patch I ended up sending. Andrew
diff --git a/Documentation/devicetree/bindings/gpio/aspeed,ast2400-gpio.yaml b/Documentation/devicetree/bindings/gpio/aspeed,ast2400-gpio.yaml new file mode 100644 index 000000000000..25f938b442e1 --- /dev/null +++ b/Documentation/devicetree/bindings/gpio/aspeed,ast2400-gpio.yaml @@ -0,0 +1,149 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/gpio/aspeed,ast2400-gpio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Aspeed GPIO controller + +maintainers: + - Andrew Jeffery <andrew@codeconstruct.com.au> + +properties: + compatible: + enum: + - aspeed,ast2400-gpio + - aspeed,ast2500-gpio + - aspeed,ast2600-gpio + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + description: The clock to use for debounce timings + + gpio-controller: true + gpio-line-names: true + gpio-ranges: true + + "#gpio-cells": + const: 2 + + interrupts: + maxItems: 1 + + interrupt-controller: true + + "#interrupt-cells": + const: 2 + + ngpios: true + +required: + - compatible + - reg + - interrupts + - interrupt-controller + - "#interrupt-cells" + - gpio-controller + - "#gpio-cells" + +allOf: + - if: + properties: + compatible: + contains: + const: aspeed,ast2400-gpio + then: + properties: + gpio-line-names: + minItems: 220 + maxItems: 220 + ngpios: + const: 220 + - if: + properties: + compatible: + contains: + const: aspeed,ast2500-gpio + then: + properties: + gpio-line-names: + minItems: 232 + maxItems: 232 + ngpios: + const: 232 + - if: + properties: + compatible: + contains: + const: aspeed,ast2600-gpio + then: + properties: + gpio-line-names: + minItems: 36 + maxItems: 208 + ngpios: + enum: [ 36, 208 ] + required: + - ngpios + +additionalProperties: false + +examples: + - | + gpio@1e780000 { + compatible = "aspeed,ast2400-gpio"; + reg = <0x1e780000 0x1000>; + interrupts = <20>; + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + #gpio-cells = <2>; + }; + - | + #include <dt-bindings/clock/aspeed-clock.h> + gpio: gpio@1e780000 { + compatible = "aspeed,ast2500-gpio"; + reg = <0x1e780000 0x200>; + clocks = <&syscon ASPEED_CLK_APB>; + interrupts = <20>; + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pinctrl 0 0 232>; + }; + - | + #include <dt-bindings/clock/ast2600-clock.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + gpio0: gpio@1e780000 { + compatible = "aspeed,ast2600-gpio"; + reg = <0x1e780000 0x400>; + clocks = <&syscon ASPEED_CLK_APB2>; + interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + #interrupt-cells = <2>; + #gpio-cells = <2>; + gpio-controller; + gpio-ranges = <&pinctrl 0 0 208>; + ngpios = <208>; + }; + - | + #include <dt-bindings/clock/ast2600-clock.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + gpio1: gpio@1e780800 { + compatible = "aspeed,ast2600-gpio"; + reg = <0x1e780800 0x800>; + clocks = <&syscon ASPEED_CLK_APB1>; + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pinctrl 0 208 36>; + ngpios = <36>; + }; diff --git a/Documentation/devicetree/bindings/gpio/gpio-aspeed.txt b/Documentation/devicetree/bindings/gpio/gpio-aspeed.txt deleted file mode 100644 index b2033fc3a71a..000000000000 --- a/Documentation/devicetree/bindings/gpio/gpio-aspeed.txt +++ /dev/null @@ -1,39 +0,0 @@ -Aspeed GPIO controller Device Tree Bindings -------------------------------------------- - -Required properties: -- compatible : Either "aspeed,ast2400-gpio", "aspeed,ast2500-gpio", - or "aspeed,ast2600-gpio". - -- #gpio-cells : Should be two - - First cell is the GPIO line number - - Second cell is used to specify optional - parameters (unused) - -- reg : Address and length of the register set for the device -- gpio-controller : Marks the device node as a GPIO controller. -- interrupts : Interrupt specifier (see interrupt bindings for - details) -- interrupt-controller : Mark the GPIO controller as an interrupt-controller - -Optional properties: - -- clocks : A phandle to the clock to use for debounce timings -- ngpios : Number of GPIOs controlled by this controller. Should be set - when there are multiple GPIO controllers on a SoC (ast2600). - -The gpio and interrupt properties are further described in their respective -bindings documentation: - -- Documentation/devicetree/bindings/gpio/gpio.txt -- Documentation/devicetree/bindings/interrupt-controller/interrupts.txt - - Example: - gpio@1e780000 { - #gpio-cells = <2>; - compatible = "aspeed,ast2400-gpio"; - gpio-controller; - interrupts = <20>; - reg = <0x1e780000 0x1000>; - interrupt-controller; - };
Squash warnings such as: ``` arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-galaxy100.dtb: /ahb/apb@1e600000/gpio@1e780000: failed to match any schema with compatible: ['aspeed,ast2400-gpio'] ``` Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au> --- v4: Add constraints for gpio-line-names, ngpios as requested by Krzysztof: https://lore.kernel.org/all/458becdb-fb1e-4808-87b6-3037ec945647@linaro.org/ Add more examples to exercise constraints. v3: https://lore.kernel.org/all/20240226051645.414935-1-andrew@codeconstruct.com.au/ Base on v6.8-rc6, fix yamllint warning Rob's bot picked the missing `#interrupt-cells` in the example on v2[1]. The patch was based on v6.8-rc1, and going back over my shell history I missed the following output from `make dt_binding_check`: ``` ... LINT Documentation/devicetree/bindings usage: yamllint [-h] [-] [-c CONFIG_FILE | -d CONFIG_DATA] [--list-files] [-f {parsable,standard,colored,github,auto}] [-s] [--no-warnings] [-v] [FILE_OR_DIR ...] yamllint: error: one of the arguments FILE_OR_DIR - is required ... ``` I've rebased on v6.8-rc6 and no-longer see the issue with the invocation of `yamllint`. [1]: https://lore.kernel.org/all/170892197611.2260479.15343562563553959436.robh@kernel.org/ v2: https://lore.kernel.org/all/20240226031951.284847-1-andrew@codeconstruct.com.au/ Address feedback from Krzysztof: https://lore.kernel.org/all/0d1dd262-b6dd-4d71-9239-8b0aec8cceff@linaro.org/ v1: https://lore.kernel.org/all/20240220052918.742793-1-andrew@codeconstruct.com.au/ .../bindings/gpio/aspeed,ast2400-gpio.yaml | 149 ++++++++++++++++++ .../devicetree/bindings/gpio/gpio-aspeed.txt | 39 ----- 2 files changed, 149 insertions(+), 39 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/aspeed,ast2400-gpio.yaml delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-aspeed.txt base-commit: d206a76d7d2726f3b096037f2079ce0bd3ba329b