From: Nazim Amirul Arria10 SoCFPGA DWMAC nodes use reset-names = "stmmaceth", "stmmaceth-ocp", which matches what dwmac-socfpga looks up for the OCP reset. The generic snps,dwmac binding only allowed "ahb" as the second reset name, so Arria10 DTS failed schema validation. Allow "stmmaceth-ocp" as an alternative second reset name and drop the related TODO from the Altera SoCFPGA DWMAC binding. Signed-off-by: Nazim Amirul --- .../devicetree/bindings/net/altr,socfpga-stmmac.yaml | 2 -- Documentation/devicetree/bindings/net/snps,dwmac.yaml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/net/altr,socfpga-stmmac.yaml b/Documentation/devicetree/bindings/net/altr,socfpga-stmmac.yaml index db93436c96fa..d8f90d36d246 100644 --- a/Documentation/devicetree/bindings/net/altr,socfpga-stmmac.yaml +++ b/Documentation/devicetree/bindings/net/altr,socfpga-stmmac.yaml @@ -13,8 +13,6 @@ description: This binding describes the Altera SOCFPGA SoC implementation of the Synopsys DWMAC for the Cyclone5, Arria5, Stratix10, Agilex5 and Agilex7 families of chips. - # TODO: Determine how to handle the Arria10 reset-name, stmmaceth-ocp, that - # does not validate against net/snps,dwmac.yaml. select: properties: diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 2449311c6d28..c7f1a7c11c8d 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -174,7 +174,7 @@ properties: minItems: 1 items: - description: GMAC stmmaceth reset - - description: AHB reset + - description: AHB or OCP reset reset-names: oneOf: @@ -182,7 +182,7 @@ properties: - enum: [stmmaceth, ahb] - items: - const: stmmaceth - - const: ahb + - enum: [ahb, stmmaceth-ocp] power-domains: maxItems: 1 -- 2.43.7