| Message ID | 20231029042712.520010-4-cristian.ciocaltea@collabora.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Enable networking support for StarFive JH7100 SoC | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On 29/10/2023 05:27, Cristian Ciocaltea wrote: > The reset description items are already provided by the referenced > snps,dwmac.yaml schema, hence replace them with the necessary > {min,max}Items. > > Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> > --- > .../devicetree/bindings/net/starfive,jh7110-dwmac.yaml | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > index cc3e1c6fc135..44e58755a5a2 100644 > --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > @@ -46,9 +46,8 @@ properties: > maxItems: 3 > > resets: > - items: > - - description: MAC Reset signal. > - - description: AHB Reset signal. > + minItems: 2 > + maxItems: 2 You must also update reset-names. They must have same constraints. Best regards, Krzysztof
On 10/29/23 13:19, Krzysztof Kozlowski wrote: > On 29/10/2023 05:27, Cristian Ciocaltea wrote: >> The reset description items are already provided by the referenced >> snps,dwmac.yaml schema, hence replace them with the necessary >> {min,max}Items. >> >> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> >> --- >> .../devicetree/bindings/net/starfive,jh7110-dwmac.yaml | 5 ++--- >> 1 file changed, 2 insertions(+), 3 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >> index cc3e1c6fc135..44e58755a5a2 100644 >> --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >> +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >> @@ -46,9 +46,8 @@ properties: >> maxItems: 3 >> >> resets: >> - items: >> - - description: MAC Reset signal. >> - - description: AHB Reset signal. >> + minItems: 2 >> + maxItems: 2 > > You must also update reset-names. They must have same constraints. reset-names explicitly lists the items and we need to keep them as such because the order is not fixed, i.e. PATCH 1 allows using 'ahb' instead of 'stmmaceth' as the first (and only) item. reset-names: items: - const: stmmaceth - const: ahb Thanks, Cristian
On 29/10/2023 22:23, Cristian Ciocaltea wrote: > On 10/29/23 13:19, Krzysztof Kozlowski wrote: >> On 29/10/2023 05:27, Cristian Ciocaltea wrote: >>> The reset description items are already provided by the referenced >>> snps,dwmac.yaml schema, hence replace them with the necessary >>> {min,max}Items. >>> >>> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> >>> --- >>> .../devicetree/bindings/net/starfive,jh7110-dwmac.yaml | 5 ++--- >>> 1 file changed, 2 insertions(+), 3 deletions(-) >>> >>> diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >>> index cc3e1c6fc135..44e58755a5a2 100644 >>> --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >>> +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >>> @@ -46,9 +46,8 @@ properties: >>> maxItems: 3 >>> >>> resets: >>> - items: >>> - - description: MAC Reset signal. >>> - - description: AHB Reset signal. >>> + minItems: 2 >>> + maxItems: 2 >> >> You must also update reset-names. They must have same constraints. > > reset-names explicitly lists the items and we need to keep them as such > because the order is not fixed, i.e. PATCH 1 allows using 'ahb' instead > of 'stmmaceth' as the first (and only) item. > > reset-names: > items: > - const: stmmaceth > - const: ahb OK. Anyway this patch is no-op because next one removes this code. Adding cleanup which is immediately removed does not make much sense. Drop it. > > Thanks, > Cristian Best regards, Krzysztof
On 10/30/23 09:29, Krzysztof Kozlowski wrote: > On 29/10/2023 22:23, Cristian Ciocaltea wrote: >> On 10/29/23 13:19, Krzysztof Kozlowski wrote: >>> On 29/10/2023 05:27, Cristian Ciocaltea wrote: >>>> The reset description items are already provided by the referenced >>>> snps,dwmac.yaml schema, hence replace them with the necessary >>>> {min,max}Items. >>>> >>>> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> >>>> --- >>>> .../devicetree/bindings/net/starfive,jh7110-dwmac.yaml | 5 ++--- >>>> 1 file changed, 2 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >>>> index cc3e1c6fc135..44e58755a5a2 100644 >>>> --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >>>> +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >>>> @@ -46,9 +46,8 @@ properties: >>>> maxItems: 3 >>>> >>>> resets: >>>> - items: >>>> - - description: MAC Reset signal. >>>> - - description: AHB Reset signal. >>>> + minItems: 2 >>>> + maxItems: 2 >>> >>> You must also update reset-names. They must have same constraints. >> >> reset-names explicitly lists the items and we need to keep them as such >> because the order is not fixed, i.e. PATCH 1 allows using 'ahb' instead >> of 'stmmaceth' as the first (and only) item. >> >> reset-names: >> items: >> - const: stmmaceth >> - const: ahb > > OK. Anyway this patch is no-op because next one removes this code. > Adding cleanup which is immediately removed does not make much sense. > Drop it. The next patch just moves that under an if clause. Regards, Cristian
diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml index cc3e1c6fc135..44e58755a5a2 100644 --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml @@ -46,9 +46,8 @@ properties: maxItems: 3 resets: - items: - - description: MAC Reset signal. - - description: AHB Reset signal. + minItems: 2 + maxItems: 2 reset-names: items:
The reset description items are already provided by the referenced snps,dwmac.yaml schema, hence replace them with the necessary {min,max}Items. Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> --- .../devicetree/bindings/net/starfive,jh7110-dwmac.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)