| Message ID | 20240327015750.226349-2-chunhau.tan@starfivetech.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Add StarFive JH8100 dwmac support | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On 27/03/2024 02:57, Tan Chun Hau wrote: > Add StarFive JH8100 dwmac support. > The JH8100 dwmac shares the same driver code as the JH7110 dwmac > and has only one reset signal. > > Please refer to below: > > JH8100: reset-names = "stmmaceth"; > JH7110: reset-names = "stmmaceth", "ahb"; > JH7100: reset-names = "ahb"; > > Example usage of JH8100 in the device tree: > > gmac0: ethernet@16030000 { > compatible = "starfive,jh8100-dwmac", > "starfive,jh7110-dwmac", > "snps,dwmac-5.20"; > ... > }; > > Signed-off-by: Tan Chun Hau <chunhau.tan@starfivetech.com> > --- > .../devicetree/bindings/net/snps,dwmac.yaml | 1 + > .../bindings/net/starfive,jh7110-dwmac.yaml | 29 +++++++++++++++---- > 2 files changed, 25 insertions(+), 5 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > index 6b0341a8e0ea..a6d596b7dcf4 100644 > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > @@ -97,6 +97,7 @@ properties: > - snps,dwxgmac-2.10 > - starfive,jh7100-dwmac > - starfive,jh7110-dwmac > + - starfive,jh8100-dwmac I think that's not needed. You have there already your fallback. > > reg: > minItems: 1 > diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > index 0d1962980f57..5805a58c55d1 100644 > --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > @@ -18,6 +18,7 @@ select: > enum: > - starfive,jh7100-dwmac > - starfive,jh7110-dwmac > + - starfive,jh8100-dwmac Same here, even more obvious. > required: > - compatible > > @@ -30,6 +31,10 @@ properties: > - items: > - const: starfive,jh7110-dwmac > - const: snps,dwmac-5.20 > + - items: > + - const: starfive,jh8100-dwmac > + - const: starfive,jh7110-dwmac > + - const: snps,dwmac-5.20 > > reg: > maxItems: 1 > @@ -116,11 +121,25 @@ allOf: > minItems: 3 > maxItems: 3 > > - resets: > - minItems: 2 > - > - reset-names: > - minItems: 2 > + if: I would personally avoid nesting if within if. It gets unreadable. Although Rob did not comment on this one, so I guess it is fine. Best regards, Krzysztof
On Wed, Mar 27, 2024 at 08:54:30AM +0100, Krzysztof Kozlowski wrote: > On 27/03/2024 02:57, Tan Chun Hau wrote: > > Add StarFive JH8100 dwmac support. > > The JH8100 dwmac shares the same driver code as the JH7110 dwmac > > and has only one reset signal. > > > > Please refer to below: > > > > JH8100: reset-names = "stmmaceth"; > > JH7110: reset-names = "stmmaceth", "ahb"; > > JH7100: reset-names = "ahb"; > > > > Example usage of JH8100 in the device tree: > > > > gmac0: ethernet@16030000 { > > compatible = "starfive,jh8100-dwmac", > > "starfive,jh7110-dwmac", > > "snps,dwmac-5.20"; > > ... > > }; > > > > Signed-off-by: Tan Chun Hau <chunhau.tan@starfivetech.com> > > --- > > .../devicetree/bindings/net/snps,dwmac.yaml | 1 + > > .../bindings/net/starfive,jh7110-dwmac.yaml | 29 +++++++++++++++---- > > 2 files changed, 25 insertions(+), 5 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > > index 6b0341a8e0ea..a6d596b7dcf4 100644 > > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml > > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > > @@ -97,6 +97,7 @@ properties: > > - snps,dwxgmac-2.10 > > - starfive,jh7100-dwmac > > - starfive,jh7110-dwmac > > + - starfive,jh8100-dwmac > > I think that's not needed. You have there already your fallback. > > > > > reg: > > minItems: 1 > > diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > > index 0d1962980f57..5805a58c55d1 100644 > > --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > > +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > > @@ -18,6 +18,7 @@ select: > > enum: > > - starfive,jh7100-dwmac > > - starfive,jh7110-dwmac > > + - starfive,jh8100-dwmac > > Same here, even more obvious. Agreed. > > > required: > > - compatible > > > > @@ -30,6 +31,10 @@ properties: > > - items: > > - const: starfive,jh7110-dwmac > > - const: snps,dwmac-5.20 > > + - items: > > + - const: starfive,jh8100-dwmac > > + - const: starfive,jh7110-dwmac > > + - const: snps,dwmac-5.20 > > > > reg: > > maxItems: 1 > > @@ -116,11 +121,25 @@ allOf: > > minItems: 3 > > maxItems: 3 > > > > - resets: > > - minItems: 2 > > - > > - reset-names: > > - minItems: 2 > > + if: > > I would personally avoid nesting if within if. It gets unreadable. > Although Rob did not comment on this one, so I guess it is fine. I normally agree, but here I suggested it as it looked to be the simplest option. With the 2 other comments addressed, Reviewed-by: Rob Herring <robh@kernel.org>
> -----Original Message----- > From: Rob Herring <robh@kernel.org> > Sent: Friday, 29 March, 2024 4:42 AM > To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Cc: ChunHau Tan <chunhau.tan@starfivetech.com>; David S . Miller > <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub > Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; Emil Renner > Berthing <kernel@esmil.dk>; Krzysztof Kozlowski > <krzysztof.kozlowski+dt@linaro.org>; Conor Dooley <conor+dt@kernel.org>; > Maxime Coquelin <mcoquelin.stm32@gmail.com>; Alexandre Torgue > <alexandre.torgue@foss.st.com>; Simon Horman <horms@kernel.org>; Bartosz > Golaszewski <bartosz.golaszewski@linaro.org>; Andrew Halaney > <ahalaney@redhat.com>; Jisheng Zhang <jszhang@kernel.org>; Uwe > Kleine-König <u.kleine-koenig@pengutronix.de>; Russell King > <rmk+kernel@armlinux.org.uk>; Leyfoon Tan <leyfoon.tan@starfivetech.com>; > JeeHeng Sia <jeeheng.sia@starfivetech.com>; netdev@vger.kernel.org; > devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; > linux-stm32@st-md-mailman.stormreply.com; > linux-arm-kernel@lists.infradead.org; linux-riscv@lists.infradead.org > Subject: Re: [PATCH v5 1/1] dt-bindings: net: starfive,jh7110-dwmac: Add > StarFive JH8100 support > > On Wed, Mar 27, 2024 at 08:54:30AM +0100, Krzysztof Kozlowski wrote: > > On 27/03/2024 02:57, Tan Chun Hau wrote: > > > Add StarFive JH8100 dwmac support. > > > The JH8100 dwmac shares the same driver code as the JH7110 dwmac and > > > has only one reset signal. > > > > > > Please refer to below: > > > > > > JH8100: reset-names = "stmmaceth"; > > > JH7110: reset-names = "stmmaceth", "ahb"; > > > JH7100: reset-names = "ahb"; > > > > > > Example usage of JH8100 in the device tree: > > > > > > gmac0: ethernet@16030000 { > > > compatible = "starfive,jh8100-dwmac", > > > "starfive,jh7110-dwmac", > > > "snps,dwmac-5.20"; > > > ... > > > }; > > > > > > Signed-off-by: Tan Chun Hau <chunhau.tan@starfivetech.com> > > > --- > > > .../devicetree/bindings/net/snps,dwmac.yaml | 1 + > > > .../bindings/net/starfive,jh7110-dwmac.yaml | 29 +++++++++++++++---- > > > 2 files changed, 25 insertions(+), 5 deletions(-) > > > > > > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml > > > b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > > > index 6b0341a8e0ea..a6d596b7dcf4 100644 > > > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml > > > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > > > @@ -97,6 +97,7 @@ properties: > > > - snps,dwxgmac-2.10 > > > - starfive,jh7100-dwmac > > > - starfive,jh7110-dwmac > > > + - starfive,jh8100-dwmac > > > > I think that's not needed. You have there already your fallback. Okay, I will remove it. > > > > > > > > reg: > > > minItems: 1 > > > diff --git > > > a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > > > b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > > > index 0d1962980f57..5805a58c55d1 100644 > > > --- > > > a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > > > +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.ya > > > +++ ml > > > @@ -18,6 +18,7 @@ select: > > > enum: > > > - starfive,jh7100-dwmac > > > - starfive,jh7110-dwmac > > > + - starfive,jh8100-dwmac > > > > Same here, even more obvious. > > Agreed. Okay, I will remove it. > > > > > > required: > > > - compatible > > > > > > @@ -30,6 +31,10 @@ properties: > > > - items: > > > - const: starfive,jh7110-dwmac > > > - const: snps,dwmac-5.20 > > > + - items: > > > + - const: starfive,jh8100-dwmac > > > + - const: starfive,jh7110-dwmac > > > + - const: snps,dwmac-5.20 > > > > > > reg: > > > maxItems: 1 > > > @@ -116,11 +121,25 @@ allOf: > > > minItems: 3 > > > maxItems: 3 > > > > > > - resets: > > > - minItems: 2 > > > - > > > - reset-names: > > > - minItems: 2 > > > + if: > > > > I would personally avoid nesting if within if. It gets unreadable. > > Although Rob did not comment on this one, so I guess it is fine. > > I normally agree, but here I suggested it as it looked to be the simplest option. > > With the 2 other comments addressed, > > Reviewed-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 6b0341a8e0ea..a6d596b7dcf4 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -97,6 +97,7 @@ properties: - snps,dwxgmac-2.10 - starfive,jh7100-dwmac - starfive,jh7110-dwmac + - starfive,jh8100-dwmac reg: minItems: 1 diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml index 0d1962980f57..5805a58c55d1 100644 --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml @@ -18,6 +18,7 @@ select: enum: - starfive,jh7100-dwmac - starfive,jh7110-dwmac + - starfive,jh8100-dwmac required: - compatible @@ -30,6 +31,10 @@ properties: - items: - const: starfive,jh7110-dwmac - const: snps,dwmac-5.20 + - items: + - const: starfive,jh8100-dwmac + - const: starfive,jh7110-dwmac + - const: snps,dwmac-5.20 reg: maxItems: 1 @@ -116,11 +121,25 @@ allOf: minItems: 3 maxItems: 3 - resets: - minItems: 2 - - reset-names: - minItems: 2 + if: + properties: + compatible: + contains: + const: starfive,jh8100-dwmac + then: + properties: + resets: + maxItems: 1 + + reset-names: + const: stmmaceth + else: + properties: + resets: + minItems: 2 + + reset-names: + minItems: 2 unevaluatedProperties: false
Add StarFive JH8100 dwmac support. The JH8100 dwmac shares the same driver code as the JH7110 dwmac and has only one reset signal. Please refer to below: JH8100: reset-names = "stmmaceth"; JH7110: reset-names = "stmmaceth", "ahb"; JH7100: reset-names = "ahb"; Example usage of JH8100 in the device tree: gmac0: ethernet@16030000 { compatible = "starfive,jh8100-dwmac", "starfive,jh7110-dwmac", "snps,dwmac-5.20"; ... }; Signed-off-by: Tan Chun Hau <chunhau.tan@starfivetech.com> --- .../devicetree/bindings/net/snps,dwmac.yaml | 1 + .../bindings/net/starfive,jh7110-dwmac.yaml | 29 +++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-)