From e9ee910218ffd420454b52a052d6f1087354905b Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Sun, 7 Jan 2024 17:11:38 -0800 Subject: Revert "net: stmmac: Enable Per DMA Channel interrupt" Revert "net: stmmac: Use interrupt mode INTM=1 for per channel irq" This reverts commit 36af9f25ddfd311da82628f194c794786467cb12. Revert "net: stmmac: Add support for TX/RX channel interrupt" This reverts commit 9072e03d32088137a435ddf3aa95fd6e038d69d8. Revert "net: stmmac: Make MSI interrupt routine generic" This reverts commit 477bd4beb93bf9ace9bda71f1437b191befa9cf4. Revert "dt-bindings: net: snps,dwmac: per channel irq" This reverts commit 67d47c8ada0f8795bfcdb85cc8f2ad3ce556674b. Device tree bindings need to be reviewed. Link: https://lore.kernel.org/all/2df9fe3e-7971-4aa2-89a9-0e085b3b00d7@linaro.org/ Signed-off-by: Jakub Kicinski --- .../devicetree/bindings/net/snps,dwmac.yaml | 24 +++++++--------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index e72dded824f4..5c2769dc689a 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -103,27 +103,17 @@ properties: interrupts: minItems: 1 - maxItems: 19 + items: + - description: Combined signal for various interrupt events + - description: The interrupt to manage the remote wake-up packet detection + - description: The interrupt that occurs when Rx exits the LPI state interrupt-names: minItems: 1 - maxItems: 19 items: - oneOf: - - description: Combined signal for various interrupt events - const: macirq - - description: The interrupt to manage the remote wake-up packet detection - const: eth_wake_irq - - description: The interrupt that occurs when Rx exits the LPI state - const: eth_lpi - - description: DMA Tx per-channel interrupt - pattern: '^dma_tx[0-7]?$' - - description: DMA Rx per-channel interrupt - pattern: '^dma_rx[0-7]?$' - - allOf: - - contains: - const: macirq + - const: macirq + - enum: [eth_wake_irq, eth_lpi] + - const: eth_lpi clocks: minItems: 1 -- cgit v1.2.3