On 10/30/23 09:30, Krzysztof Kozlowski wrote: > On 29/10/2023 23:15, Cristian Ciocaltea wrote: >> 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. > > What is used by JH7000? Driver reports "Synopsys ID: 0x37", so it could be 3.70a or 3.710, as those are the only compatibles available for 3.7x. It's worth noting the driver does not rely on the compatibles for implementing version specific logic, as it gets the IDs directly from chip registers. The usage of generic snps,dwmac fallback was borrowed from downstream code. Regards, Cristian
