| Message ID | 20240111025531.2875-2-chunhau.tan@starfivetech.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| 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 11/01/2024 03:55, Tan Chun Hau wrote: > Add StarFive JH8100 dwmac support. > JH8100 dwmac has one reset signal instead of 2 resets as in JH7110. > > Signed-off-by: Tan Chun Hau <chunhau.tan@starfivetech.com> > --- > .../devicetree/bindings/net/snps,dwmac.yaml | 1 + > .../bindings/net/starfive,jh7110-dwmac.yaml | 50 +++++++++++++------ > 2 files changed, 37 insertions(+), 14 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > index 5c2769dc689a..350b3d76630f 100644 > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > @@ -96,6 +96,7 @@ properties: > - snps,dwxgmac > - snps,dwxgmac-2.10 > - starfive,jh7110-dwmac > + - starfive,jh8100-dwmac Drop, not needed. > > reg: > minItems: 1 > diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > index 5e7cfbbebce6..7e4547961bab 100644 > --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > @@ -17,15 +17,23 @@ select: > contains: > enum: > - starfive,jh7110-dwmac > + - starfive,jh8100-dwmac Drop, not needed. > required: > - compatible > > properties: > compatible: > - items: > - - enum: > - - starfive,jh7110-dwmac > - - const: snps,dwmac-5.20 Best regards, Krzysztof
On 1/11/24 04:55, Tan Chun Hau wrote: > Add StarFive JH8100 dwmac support. > JH8100 dwmac has one reset signal instead of 2 resets as in JH7110. > > Signed-off-by: Tan Chun Hau <chunhau.tan@starfivetech.com> > --- > .../devicetree/bindings/net/snps,dwmac.yaml | 1 + > .../bindings/net/starfive,jh7110-dwmac.yaml | 50 +++++++++++++------ > 2 files changed, 37 insertions(+), 14 deletions(-) [...] Please note this is going to conflict with the about-to-be-merged changes in [1], so probably it makes sense to wait for that to be picked up before sending a new revision. [1]: https://lore.kernel.org/lkml/20231222101001.2541758-2-cristian.ciocaltea@collabora.com/ Regards, Cristian
On 11/01/2024 19:07, Cristian Ciocaltea wrote: > On 1/11/24 04:55, Tan Chun Hau wrote: >> Add StarFive JH8100 dwmac support. >> JH8100 dwmac has one reset signal instead of 2 resets as in JH7110. >> >> Signed-off-by: Tan Chun Hau <chunhau.tan@starfivetech.com> >> --- >> .../devicetree/bindings/net/snps,dwmac.yaml | 1 + >> .../bindings/net/starfive,jh7110-dwmac.yaml | 50 +++++++++++++------ >> 2 files changed, 37 insertions(+), 14 deletions(-) > > [...] > > Please note this is going to conflict with the about-to-be-merged changes They weren't picked up, so how they can be merged? If you mean applied, then you suggest your patchset has some kind of preference, but this needs explanation why. Best regards, Krzysztof
On 1/11/24 20:15, Krzysztof Kozlowski wrote: > On 11/01/2024 19:07, Cristian Ciocaltea wrote: >> On 1/11/24 04:55, Tan Chun Hau wrote: >>> Add StarFive JH8100 dwmac support. >>> JH8100 dwmac has one reset signal instead of 2 resets as in JH7110. >>> >>> Signed-off-by: Tan Chun Hau <chunhau.tan@starfivetech.com> >>> --- >>> .../devicetree/bindings/net/snps,dwmac.yaml | 1 + >>> .../bindings/net/starfive,jh7110-dwmac.yaml | 50 +++++++++++++------ >>> 2 files changed, 37 insertions(+), 14 deletions(-) >> >> [...] >> >> Please note this is going to conflict with the about-to-be-merged changes > > They weren't picked up, so how they can be merged? If you mean applied, > then you suggest your patchset has some kind of preference, but this > needs explanation why. I just meant they got reviewed and should be ready to be applied. > Best regards, > Krzysztof >
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 5c2769dc689a..350b3d76630f 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -96,6 +96,7 @@ properties: - snps,dwxgmac - snps,dwxgmac-2.10 - 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 5e7cfbbebce6..7e4547961bab 100644 --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml @@ -17,15 +17,23 @@ select: contains: enum: - starfive,jh7110-dwmac + - starfive,jh8100-dwmac required: - compatible properties: compatible: - items: - - enum: - - starfive,jh7110-dwmac - - const: snps,dwmac-5.20 + oneOf: + - items: + - enum: + - starfive,jh7110-dwmac + - const: snps,dwmac-5.20 + + - items: + - enum: + - starfive,jh8100-dwmac + - const: starfive,jh7110-dwmac + - const: snps,dwmac-5.20 reg: maxItems: 1 @@ -54,16 +62,6 @@ properties: minItems: 3 maxItems: 3 - resets: - items: - - description: MAC Reset signal. - - description: AHB Reset signal. - - reset-names: - items: - - const: stmmaceth - - const: ahb - starfive,tx-use-rgmii-clk: description: Tx clock is provided by external rgmii clock. @@ -93,6 +91,30 @@ required: allOf: - $ref: snps,dwmac.yaml# + - if: + properties: + compatible: + contains: + enum: + - starfive,jh8100-dwmac + then: + properties: + resets: + items: + - description: MAC Reset signal. + resets-names: + items: + - const: stmmaceth + else: + properties: + resets: + items: + - description: MAC Reset signal. + - description: AHB Reset signal. + resets-names: + items: + - const: stmmaceth + - const: ahb unevaluatedProperties: false
Add StarFive JH8100 dwmac support. JH8100 dwmac has one reset signal instead of 2 resets as in JH7110. Signed-off-by: Tan Chun Hau <chunhau.tan@starfivetech.com> --- .../devicetree/bindings/net/snps,dwmac.yaml | 1 + .../bindings/net/starfive,jh7110-dwmac.yaml | 50 +++++++++++++------ 2 files changed, 37 insertions(+), 14 deletions(-)