| Message ID | 20240105070925.2948871-2-leong.ching.swee@intel.com |
|---|---|
| State | Accepted |
| Commit | 67d47c8ada0f8795bfcdb85cc8f2ad3ce556674b |
| Headers | show |
| Series | net: stmmac: Enable Per DMA Channel interrupt | expand |
On Fri, Jan 05, 2024 at 03:09:22PM +0800, Leong Ching Swee wrote: > From: Swee Leong Ching <leong.ching.swee@intel.com> > > Add dt-bindings for per channel irq. > > Signed-off-by: Rohan G Thomas <rohan.g.thomas@intel.com> > Signed-off-by: Swee Leong Ching <leong.ching.swee@intel.com> > --- > .../devicetree/bindings/net/snps,dwmac.yaml | 24 +++++++++++++------ > 1 file changed, 17 insertions(+), 7 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > index 5c2769dc689a..e72dded824f4 100644 > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > @@ -103,17 +103,27 @@ properties: > > interrupts: > minItems: 1 > - 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 > + maxItems: 19 > > interrupt-names: > minItems: 1 > + maxItems: 19 > items: > - - const: macirq > - - enum: [eth_wake_irq, eth_lpi] > - - const: eth_lpi > + 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 In order to restore the v1 discussion around this change, here is my comment copied from there: > As Rob correctly noted it's also better to make sure that 'macirq' is placed first > in the array. So instead of the constraint above I guess the next one would > make sure both the array has 'macirq' name and it's the first item: > > allOf: > - maxItems: 34 > items: > - const: macirq Leong said it didn't work: https://lore.kernel.org/netdev/CH0PR11MB54904615B45E521DE6B1A7B3CF61A@CH0PR11MB5490.namprd11.prod.outlook.com/ Rob, Krzysztof, Conor could you please clarify whether this change is ok the way it is or it would be better to preserve the stricter constraint and fix the DT-schema validation tool somehow? -Serge(y) > > clocks: > minItems: 1 > -- > 2.34.1 > >
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 5c2769dc689a..e72dded824f4 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -103,17 +103,27 @@ properties: interrupts: minItems: 1 - 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 + maxItems: 19 interrupt-names: minItems: 1 + maxItems: 19 items: - - const: macirq - - enum: [eth_wake_irq, eth_lpi] - - const: eth_lpi + 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 clocks: minItems: 1