On Thu, Mar 16, 2023 at 08:13:24AM +0100, Krzysztof Kozlowski wrote:
> On 13/03/2023 17:56, Andrew Halaney wrote:
> > From: Bhupesh Sharma <bhupesh.sharma@xxxxxxxxxx>
> >
> > As commit fc191af1bb0d ("net: stmmac: platform: Fix misleading
> > interrupt error msg") noted, not every stmmac based platform
> > makes use of the 'eth_wake_irq' or 'eth_lpi' interrupts.
> >
> > So, update the 'interrupt-names' inside 'snps,dwmac' YAML
> > bindings to reflect the same.
> >
> > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
> > Signed-off-by: Bhupesh Sharma <bhupesh.sharma@xxxxxxxxxx>
> > Signed-off-by: Andrew Halaney <ahalaney@xxxxxxxxxx>
> > ---
> >
> > I picked this up from:
> > https://lore.kernel.org/netdev/20220929060405.2445745-2-bhupesh.sharma@xxxxxxxxxx/
> > No changes other than collecting the Acked-by.
> >
> > Documentation/devicetree/bindings/net/snps,dwmac.yaml | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > index 16b7d2904696..52ce14a4bea7 100644
> > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > @@ -105,8 +105,8 @@ properties:
> > minItems: 1
> > items:
> > - const: macirq
> > - - const: eth_wake_irq
> > - - const: eth_lpi
> > + - enum: [eth_wake_irq, eth_lpi]
> > + - enum: [eth_wake_irq, eth_lpi]
>
> I acked it before but this is not correct. This should be:
> + - enum: [eth_wake_irq, eth_lpi]
> + - enum: eth_lpi
Would
+ - enum: [eth_wake_irq, eth_lpi]
+ - const: eth_lpi
be more appropriate? With the suggested change above I get the following
error, but with the above things seem to work as I expect:
(dtschema) ahalaney@halaney-x13s ~/git/redhat/stmmac (git)-[stmmac|rebase-i] % git diff HEAD~
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
index 16b7d2904696..ca199a17f83d 100644
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
@@ -105,8 +105,8 @@ properties:
minItems: 1
items:
- const: macirq
- - const: eth_wake_irq
- - const: eth_lpi
+ - enum: [eth_wake_irq, eth_lpi]
+ - enum: eth_lpi
clocks:
minItems: 1
(dtschema) ahalaney@halaney-x13s ~/git/redhat/stmmac (git)-[stmmac|rebase-i] % make dt_binding_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/net/snps,dwmac.yaml
DTEX Documentation/devicetree/bindings/net/snps,dwmac.example.dts
LINT Documentation/devicetree/bindings
CHKDT Documentation/devicetree/bindings/processed-schema.json
/home/ahalaney/git/redhat/stmmac/Documentation/devicetree/bindings/net/snps,dwmac.yaml: properties:interrupt-names:items: 'anyOf' conditional failed, one must be fixed:
[{'const': 'macirq'}, {'enum': ['eth_wake_irq', 'eth_lpi']}, {'enum': 'eth_lpi'}] is not of type 'object', 'boolean'
'eth_lpi' is not of type 'array'
from schema $id: http://json-schema.org/draft-07/schema#
/home/ahalaney/git/redhat/stmmac/Documentation/devicetree/bindings/net/snps,dwmac.yaml: properties:interrupt-names:items: 'oneOf' conditional failed, one must be fixed:
[{'const': 'macirq'}, {'enum': ['eth_wake_irq', 'eth_lpi']}, {'enum': 'eth_lpi'}] is not of type 'object'
'eth_lpi' is not of type 'array'
from schema $id: http://devicetree.org/meta-schemas/keywords.yaml#
/home/ahalaney/git/redhat/stmmac/Documentation/devicetree/bindings/net/snps,dwmac.yaml: properties:interrupt-names:items: 'oneOf' conditional failed, one must be fixed:
[{'const': 'macirq'}, {'enum': ['eth_wake_irq', 'eth_lpi']}, {'enum': 'eth_lpi'}] is not of type 'object'
'eth_lpi' is not of type 'array'
from schema $id: http://devicetree.org/meta-schemas/string-array.yaml#
SCHEMA Documentation/devicetree/bindings/processed-schema.json
/home/ahalaney/git/redhat/stmmac/Documentation/devicetree/bindings/net/snps,dwmac.yaml: ignoring, error in schema: properties: interrupt-names: items
DTC_CHK Documentation/devicetree/bindings/net/snps,dwmac.example.dtb
Thanks,
Andrew
