| Message ID | 20211215021652.7270-7-biao.huang@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | MediaTek Ethernet Patches on MT8195 | expand |
On Wed, Dec 15, 2021 at 10:16:52AM +0800, Biao Huang wrote: > Add binding document for the ethernet on mt8195. > > Signed-off-by: Biao Huang <biao.huang@mediatek.com> > --- > .../bindings/net/mediatek-dwmac.yaml | 42 ++++++++++++++----- > 1 file changed, 32 insertions(+), 10 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml b/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml > index 8ad6e19661b8..44d55146def4 100644 > --- a/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml > +++ b/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml > @@ -19,6 +19,7 @@ select: > contains: > enum: > - mediatek,mt2712-gmac > + - mediatek,mt8195-gmac > required: > - compatible > > @@ -27,26 +28,37 @@ allOf: > > properties: > compatible: > - items: > - - enum: > - - mediatek,mt2712-gmac > - - const: snps,dwmac-4.20a > + oneOf: > + - items: > + - enum: > + - mediatek,mt2712-gmac > + - const: snps,dwmac-4.20a > + - items: > + - enum: > + - mediatek,mt8195-gmac > + - const: snps,dwmac-5.10a > > clocks: > + minItems: 5 As before, you need 'minItems: 4' in the previous patch. If you aren't clear what's needed, run 'make dtbs_checks' yourself before submitting again. > items: > - description: AXI clock > - description: APB clock > - description: MAC Main clock > - description: PTP clock > - description: RMII reference clock provided by MAC > + - description: MAC clock gate > > clock-names: > - items: > - - const: axi > - - const: apb > - - const: mac_main > - - const: ptp_ref > - - const: rmii_internal > + minItems: 5 > + maxItems: 6 > + contains: No, you just threw out the order requirements. And this schema will be true with just 1 of the strings below plus any other strings. For example, this will pass: clock-names = "foo", "bar", "axi", "baz", "rob"; > + enum: > + - axi > + - apb > + - mac_main > + - ptp_ref > + - rmii_internal > + - mac_cg > > mediatek,pericfg: > $ref: /schemas/types.yaml#/definitions/phandle > @@ -61,6 +73,8 @@ properties: > or will round down. Range 0~31*170. > For MT2712 RMII/MII interface, Allowed value need to be a multiple of 550, > or will round down. Range 0~31*550. > + For MT8195 RGMII/RMII/MII interface, Allowed value need to be a multiple of 290, > + or will round down. Range 0~31*290. > > mediatek,rx-delay-ps: > description: > @@ -69,6 +83,8 @@ properties: > or will round down. Range 0~31*170. > For MT2712 RMII/MII interface, Allowed value need to be a multiple of 550, > or will round down. Range 0~31*550. > + For MT8195 RGMII/RMII/MII interface, Allowed value need to be a multiple > + of 290, or will round down. Range 0~31*290. > > mediatek,rmii-rxc: > type: boolean > @@ -102,6 +118,12 @@ properties: > 3. the inside clock, which be sent to MAC, will be inversed in RMII case when > the reference clock is from MAC. > > + mediatek,mac-wol: > + type: boolean > + description: > + If present, indicates that MAC supports WOL(Wake-On-LAN), and MAC WOL will be enabled. > + Otherwise, PHY WOL is perferred. > + > required: > - compatible > - reg > -- > 2.25.1 > >
Dear Rob, Thanks for your comments~ On Wed, 2021-12-15 at 16:13 -0600, Rob Herring wrote: > On Wed, Dec 15, 2021 at 10:16:52AM +0800, Biao Huang wrote: > > Add binding document for the ethernet on mt8195. > > > > Signed-off-by: Biao Huang <biao.huang@mediatek.com> > > --- > > .../bindings/net/mediatek-dwmac.yaml | 42 ++++++++++++++- > > ---- > > 1 file changed, 32 insertions(+), 10 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/net/mediatek- > > dwmac.yaml b/Documentation/devicetree/bindings/net/mediatek- > > dwmac.yaml > > index 8ad6e19661b8..44d55146def4 100644 > > --- a/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml > > +++ b/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml > > @@ -19,6 +19,7 @@ select: > > contains: > > enum: > > - mediatek,mt2712-gmac > > + - mediatek,mt8195-gmac > > required: > > - compatible > > > > @@ -27,26 +28,37 @@ allOf: > > > > properties: > > compatible: > > - items: > > - - enum: > > - - mediatek,mt2712-gmac > > - - const: snps,dwmac-4.20a > > + oneOf: > > + - items: > > + - enum: > > + - mediatek,mt2712-gmac > > + - const: snps,dwmac-4.20a > > + - items: > > + - enum: > > + - mediatek,mt8195-gmac > > + - const: snps,dwmac-5.10a > > > > clocks: > > + minItems: 5 > > As before, you need 'minItems: 4' in the previous patch. > > If you aren't clear what's needed, run 'make dtbs_checks' yourself > before submitting again. But as modified in "[PATCH net-next v9 3/6] arm64: dts: mt2712: update ethernet device node", we expect "minItems: 5". run 'make dtbs_checks' with "[PATCH net-next v9 3/6] arm64: dts: mt2712: update ethernet device node" applied, will not report logs such as "ethernet@1101c000: clock-names: ['axi', 'apb', 'mac_main', 'ptp_ref'] is too short". Should it be fine if I keep "minItems:5"? > > > items: > > - description: AXI clock > > - description: APB clock > > - description: MAC Main clock > > - description: PTP clock > > - description: RMII reference clock provided by MAC > > + - description: MAC clock gate > > > > clock-names: > > - items: > > - - const: axi > > - - const: apb > > - - const: mac_main > > - - const: ptp_ref > > - - const: rmii_internal > > + minItems: 5 > > + maxItems: 6 > > + contains: > > No, you just threw out the order requirements. And this schema will > be > true with just 1 of the strings below plus any other strings. For > example, this will pass: > > clock-names = "foo", "bar", "axi", "baz", "rob"; I misunderstood this schema, and how about the following description: clock-names: minItems: 5 maxItems: 6 items: - const: axi - const: apb - const: mac_main - const: ptp_ref - const: rmii_internal - const: mac_cg Regards! > > > + enum: > > + - axi > > + - apb > > + - mac_main > > + - ptp_ref > > + - rmii_internal > > + - mac_cg > > > > mediatek,pericfg: > > $ref: /schemas/types.yaml#/definitions/phandle > > @@ -61,6 +73,8 @@ properties: > > or will round down. Range 0~31*170. > > For MT2712 RMII/MII interface, Allowed value need to be a > > multiple of 550, > > or will round down. Range 0~31*550. > > + For MT8195 RGMII/RMII/MII interface, Allowed value need to > > be a multiple of 290, > > + or will round down. Range 0~31*290. > > > > mediatek,rx-delay-ps: > > description: > > @@ -69,6 +83,8 @@ properties: > > or will round down. Range 0~31*170. > > For MT2712 RMII/MII interface, Allowed value need to be a > > multiple of 550, > > or will round down. Range 0~31*550. > > + For MT8195 RGMII/RMII/MII interface, Allowed value need to > > be a multiple > > + of 290, or will round down. Range 0~31*290. > > > > mediatek,rmii-rxc: > > type: boolean > > @@ -102,6 +118,12 @@ properties: > > 3. the inside clock, which be sent to MAC, will be inversed > > in RMII case when > > the reference clock is from MAC. > > > > + mediatek,mac-wol: > > + type: boolean > > + description: > > + If present, indicates that MAC supports WOL(Wake-On-LAN), > > and MAC WOL will be enabled. > > + Otherwise, PHY WOL is perferred. > > + > > required: > > - compatible > > - reg > > -- > > 2.25.1 > > > >
diff --git a/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml b/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml index 8ad6e19661b8..44d55146def4 100644 --- a/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml +++ b/Documentation/devicetree/bindings/net/mediatek-dwmac.yaml @@ -19,6 +19,7 @@ select: contains: enum: - mediatek,mt2712-gmac + - mediatek,mt8195-gmac required: - compatible @@ -27,26 +28,37 @@ allOf: properties: compatible: - items: - - enum: - - mediatek,mt2712-gmac - - const: snps,dwmac-4.20a + oneOf: + - items: + - enum: + - mediatek,mt2712-gmac + - const: snps,dwmac-4.20a + - items: + - enum: + - mediatek,mt8195-gmac + - const: snps,dwmac-5.10a clocks: + minItems: 5 items: - description: AXI clock - description: APB clock - description: MAC Main clock - description: PTP clock - description: RMII reference clock provided by MAC + - description: MAC clock gate clock-names: - items: - - const: axi - - const: apb - - const: mac_main - - const: ptp_ref - - const: rmii_internal + minItems: 5 + maxItems: 6 + contains: + enum: + - axi + - apb + - mac_main + - ptp_ref + - rmii_internal + - mac_cg mediatek,pericfg: $ref: /schemas/types.yaml#/definitions/phandle @@ -61,6 +73,8 @@ properties: or will round down. Range 0~31*170. For MT2712 RMII/MII interface, Allowed value need to be a multiple of 550, or will round down. Range 0~31*550. + For MT8195 RGMII/RMII/MII interface, Allowed value need to be a multiple of 290, + or will round down. Range 0~31*290. mediatek,rx-delay-ps: description: @@ -69,6 +83,8 @@ properties: or will round down. Range 0~31*170. For MT2712 RMII/MII interface, Allowed value need to be a multiple of 550, or will round down. Range 0~31*550. + For MT8195 RGMII/RMII/MII interface, Allowed value need to be a multiple + of 290, or will round down. Range 0~31*290. mediatek,rmii-rxc: type: boolean @@ -102,6 +118,12 @@ properties: 3. the inside clock, which be sent to MAC, will be inversed in RMII case when the reference clock is from MAC. + mediatek,mac-wol: + type: boolean + description: + If present, indicates that MAC supports WOL(Wake-On-LAN), and MAC WOL will be enabled. + Otherwise, PHY WOL is perferred. + required: - compatible - reg
Add binding document for the ethernet on mt8195. Signed-off-by: Biao Huang <biao.huang@mediatek.com> --- .../bindings/net/mediatek-dwmac.yaml | 42 ++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-)