On 10/29/23 13:24, Krzysztof Kozlowski wrote: > On 29/10/2023 05:27, Cristian Ciocaltea wrote: >> The Synopsys DesignWare MAC found on StarFive JH7100 SoC is quite >> similar to the newer JH7110, but it requires only two interrupts and a >> single reset line. >> >> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@xxxxxxxxxxxxx> >> --- >> .../devicetree/bindings/net/snps,dwmac.yaml | 1 + >> .../bindings/net/starfive,jh7110-dwmac.yaml | 74 +++++++++++++------ >> 2 files changed, 54 insertions(+), 21 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml >> index a4d7172ea701..c1380ff1c054 100644 >> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml >> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml >> @@ -95,6 +95,7 @@ properties: >> - snps,dwmac-5.20 >> - snps,dwxgmac >> - snps,dwxgmac-2.10 >> + - starfive,jh7100-dwmac >> - starfive,jh7110-dwmac >> >> reg: >> diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >> index 44e58755a5a2..70e35a3401f4 100644 >> --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >> +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >> @@ -13,10 +13,14 @@ maintainers: >> >> properties: >> compatible: >> - items: >> - - enum: >> - - starfive,jh7110-dwmac >> - - const: snps,dwmac-5.20 >> + oneOf: >> + - items: >> + - const: starfive,jh7100-dwmac >> + - const: snps,dwmac >> + - items: >> + - enum: >> + - starfive,jh7110-dwmac >> + - const: snps,dwmac-5.20 > > Why do you use different fallback? AFAIK, dwmac-5.20 is currently only used by JH7110. >> >> reg: >> maxItems: 1 >> @@ -37,23 +41,6 @@ properties: >> - const: tx >> - const: gtx >> >> - interrupts: >> - minItems: 3 >> - maxItems: 3 >> - >> - interrupt-names: >> - minItems: 3 >> - maxItems: 3 >> - >> - resets: >> - minItems: 2 >> - maxItems: 2 > > You just changed it in previous patches... So the previous code allowing > one item was correct? I mentioned the possible use-cases in the previous email. So yes, JH7110 requires 2 resets, while JH7100 just one. Regards, Cristian
