From: Nazim Amirul The Agilex5 SoCDK TSN Config2 gmac1 path includes an FPGA soft-IP GMII-to-RGMII converter between the DWXGMAC and the PHY. The converter provides the RGMII TX/RX delays and presents GMII toward the MAC, unlike a plain altr,socfpga-stmmac-agilex5 port with no such converter. Add altr,socfpga-stmmac-agilex5-tsn for that integration in the same compatible items entry as altr,socfpga-stmmac-agilex5 (shared snps,dwxgmac-2.10). Do not use altr,socfpga-stmmac-agilex5 as a DT fallback for the TSN port; the converter presents GMII to the MAC and supplies the RGMII delays, unlike a plain Agilex5 GMAC port. The TSN port uses the same DWXGMAC-2.10 core as the plain Agilex5 port, so extend the interrupt/interrupt-names/dma-coherent conditional to match the new compatible as well; otherwise a TSN node would incorrectly fall into the single-interrupt, non-coherent else branch. Signed-off-by: Nazim Amirul --- Previously patch 3 of the v6 board series; split out for net-next. v2: Extend the interrupt/interrupt-names/dma-coherent allOf conditional to match altr,socfpga-stmmac-agilex5-tsn, per Jakub Kicinski / netdev bot. v6: Put altr,socfpga-stmmac-agilex5-tsn in the same enum as altr,socfpga-stmmac-agilex5, per Krzysztof Kozlowski. v5: Drop altr,socfpga-stmmac-agilex5 fallback and rewrite commit message to explain hardware incompatibility, per Krzysztof Kozlowski. .../devicetree/bindings/net/altr,socfpga-stmmac.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/net/altr,socfpga-stmmac.yaml b/Documentation/devicetree/bindings/net/altr,socfpga-stmmac.yaml index ce1bd5f2c470..a6ffd7b98c1d 100644 --- a/Documentation/devicetree/bindings/net/altr,socfpga-stmmac.yaml +++ b/Documentation/devicetree/bindings/net/altr,socfpga-stmmac.yaml @@ -22,6 +22,7 @@ select: - altr,socfpga-stmmac - altr,socfpga-stmmac-a10-s10 - altr,socfpga-stmmac-agilex5 + - altr,socfpga-stmmac-agilex5-tsn required: - compatible @@ -42,7 +43,9 @@ properties: - const: snps,dwmac-3.74a - const: snps,dwmac - items: - - const: altr,socfpga-stmmac-agilex5 + - enum: + - altr,socfpga-stmmac-agilex5 + - altr,socfpga-stmmac-agilex5-tsn - const: snps,dwxgmac-2.10 clocks: @@ -178,7 +181,9 @@ allOf: properties: compatible: contains: - const: altr,socfpga-stmmac-agilex5 + enum: + - altr,socfpga-stmmac-agilex5 + - altr,socfpga-stmmac-agilex5-tsn then: properties: interrupts: -- 2.43.7