Message ID | 20230303085928.4535-5-samin.guo@starfivetech.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | Add Ethernet driver for StarFive JH7110 SoC | expand |
Context | Check | Description |
---|---|---|
conchuod/tree_selection | fail | Failed to apply to next/pending-fixes or riscv/for-next |
On Fri, Mar 03, 2023 at 04:59:20PM +0800, Samin Guo wrote: > From: Yanhong Wang <yanhong.wang@starfivetech.com> > > Add documentation to describe StarFive dwmac driver(GMAC). > > Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com> > Signed-off-by: Samin Guo <samin.guo@starfivetech.com> > --- > .../devicetree/bindings/net/snps,dwmac.yaml | 1 + > .../bindings/net/starfive,jh7110-dwmac.yaml | 117 ++++++++++++++++++ > MAINTAINERS | 6 + > 3 files changed, 124 insertions(+) > create mode 100644 Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > index 89099a888f0b..395f081161ce 100644 > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > @@ -91,6 +91,7 @@ properties: > - snps,dwmac-5.20 > - snps,dwxgmac > - snps,dwxgmac-2.10 > + - starfive,jh7110-dwmac > > reg: > minItems: 1 > diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > new file mode 100644 > index 000000000000..ca49f08d50dd > --- /dev/null > +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > @@ -0,0 +1,117 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +# Copyright (C) 2022 StarFive Technology Co., Ltd. > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/net/starfive,jh7110-dwmac.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: StarFive JH7110 DWMAC glue layer > + > +maintainers: > + - Emil Renner Berthing <kernel@esmil.dk> > + - Samin Guo <samin.guo@starfivetech.com> > + > +select: > + properties: > + compatible: > + contains: > + enum: > + - starfive,jh7110-dwmac > + required: > + - compatible > + > +properties: > + compatible: > + items: > + - enum: > + - starfive,jh7110-dwmac > + - const: snps,dwmac-5.20 > + > + clocks: > + items: > + - description: GMAC main clock > + - description: GMAC AHB clock > + - description: PTP clock > + - description: TX clock > + - description: GTX clock > + > + clock-names: > + items: > + - const: stmmaceth > + - const: pclk > + - const: ptp_ref > + - const: tx > + - const: gtx > + > + 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. > + type: boolean > + > +allOf: > + - $ref: snps,dwmac.yaml# > + > +unevaluatedProperties: true This must be false. > + > +required: > + - compatible > + - clocks > + - clock-names > + - resets > + - reset-names > + > +examples: > + - | > + ethernet@16030000 { > + compatible = "starfive,jh7110-dwmac", "snps,dwmac-5.20"; > + reg = <0x16030000 0x10000>; > + clocks = <&clk 3>, <&clk 2>, <&clk 109>, > + <&clk 6>, <&clk 111>; > + clock-names = "stmmaceth", "pclk", "ptp_ref", > + "tx", "gtx"; > + resets = <&rst 1>, <&rst 2>; > + reset-names = "stmmaceth", "ahb"; > + interrupts = <7>, <6>, <5>; > + interrupt-names = "macirq", "eth_wake_irq", "eth_lpi"; > + phy-mode = "rgmii-id"; > + snps,multicast-filter-bins = <64>; > + snps,perfect-filter-entries = <8>; > + rx-fifo-depth = <2048>; > + tx-fifo-depth = <2048>; > + snps,fixed-burst; > + snps,no-pbl-x8; > + snps,tso; > + snps,force_thresh_dma_mode; > + snps,axi-config = <&stmmac_axi_setup>; > + snps,en-tx-lpi-clockgating; > + snps,txpbl = <16>; > + snps,rxpbl = <16>; > + phy-handle = <&phy0>; > + > + mdio { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "snps,dwmac-mdio"; > + > + phy0: ethernet-phy@0 { > + reg = <0>; > + }; > + }; > + > + stmmac_axi_setup: stmmac-axi-config { > + snps,lpi_en; > + snps,wr_osr_lmt = <4>; > + snps,rd_osr_lmt = <4>; > + snps,blen = <256 128 64 32 0 0 0>; > + }; > + }; > diff --git a/MAINTAINERS b/MAINTAINERS > index 5c67c75a940f..4e236b7c7fd2 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -19912,6 +19912,12 @@ M: Emil Renner Berthing <kernel@esmil.dk> > S: Maintained > F: arch/riscv/boot/dts/starfive/ > > +STARFIVE DWMAC GLUE LAYER > +M: Emil Renner Berthing <kernel@esmil.dk> > +M: Samin Guo <samin.guo@starfivetech.com> > +S: Maintained > +F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > + > STARFIVE JH71X0 CLOCK DRIVERS > M: Emil Renner Berthing <kernel@esmil.dk> > M: Hal Feng <hal.feng@starfivetech.com> > -- > 2.17.1 >
-------- 原始信息 -------- Re: [PATCH v5 04/12] dt-bindings: net: Add support StarFive dwmac From: Rob Herring <robh@kernel.org> > On Fri, Mar 03, 2023 at 04:59:20PM +0800, Samin Guo wrote: >> From: Yanhong Wang <yanhong.wang@starfivetech.com> >> >> Add documentation to describe StarFive dwmac driver(GMAC). >> >> Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com> >> Signed-off-by: Samin Guo <samin.guo@starfivetech.com> >> --- >> .../devicetree/bindings/net/snps,dwmac.yaml | 1 + >> .../bindings/net/starfive,jh7110-dwmac.yaml | 117 ++++++++++++++++++ >> MAINTAINERS | 6 + >> 3 files changed, 124 insertions(+) >> create mode 100644 Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >> >> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml >> index 89099a888f0b..395f081161ce 100644 >> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml >> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml >> @@ -91,6 +91,7 @@ properties: >> - snps,dwmac-5.20 >> - snps,dwxgmac >> - snps,dwxgmac-2.10 >> + - starfive,jh7110-dwmac >> >> reg: >> minItems: 1 >> diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >> new file mode 100644 >> index 000000000000..ca49f08d50dd >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >> @@ -0,0 +1,117 @@ >> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) >> +# Copyright (C) 2022 StarFive Technology Co., Ltd. >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/net/starfive,jh7110-dwmac.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: StarFive JH7110 DWMAC glue layer >> + >> +maintainers: >> + - Emil Renner Berthing <kernel@esmil.dk> >> + - Samin Guo <samin.guo@starfivetech.com> >> + >> +select: >> + properties: >> + compatible: >> + contains: >> + enum: >> + - starfive,jh7110-dwmac >> + required: >> + - compatible >> + >> +properties: >> + compatible: >> + items: >> + - enum: >> + - starfive,jh7110-dwmac >> + - const: snps,dwmac-5.20 >> + >> + clocks: >> + items: >> + - description: GMAC main clock >> + - description: GMAC AHB clock >> + - description: PTP clock >> + - description: TX clock >> + - description: GTX clock >> + >> + clock-names: >> + items: >> + - const: stmmaceth >> + - const: pclk >> + - const: ptp_ref >> + - const: tx >> + - const: gtx >> + >> + 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. >> + type: boolean >> + >> +allOf: >> + - $ref: snps,dwmac.yaml# >> + >> +unevaluatedProperties: true > > This must be false. > Thanks, will fix net version. >> + >> +required: >> + - compatible >> + - clocks >> + - clock-names >> + - resets >> + - reset-names >> + >> +examples: >> + - | >> + ethernet@16030000 { >> + compatible = "starfive,jh7110-dwmac", "snps,dwmac-5.20"; >> + reg = <0x16030000 0x10000>; >> + clocks = <&clk 3>, <&clk 2>, <&clk 109>, >> + <&clk 6>, <&clk 111>; >> + clock-names = "stmmaceth", "pclk", "ptp_ref", >> + "tx", "gtx"; >> + resets = <&rst 1>, <&rst 2>; >> + reset-names = "stmmaceth", "ahb"; >> + interrupts = <7>, <6>, <5>; >> + interrupt-names = "macirq", "eth_wake_irq", "eth_lpi"; >> + phy-mode = "rgmii-id"; >> + snps,multicast-filter-bins = <64>; >> + snps,perfect-filter-entries = <8>; >> + rx-fifo-depth = <2048>; >> + tx-fifo-depth = <2048>; >> + snps,fixed-burst; >> + snps,no-pbl-x8; >> + snps,tso; >> + snps,force_thresh_dma_mode; >> + snps,axi-config = <&stmmac_axi_setup>; >> + snps,en-tx-lpi-clockgating; >> + snps,txpbl = <16>; >> + snps,rxpbl = <16>; >> + phy-handle = <&phy0>; >> + >> + mdio { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + compatible = "snps,dwmac-mdio"; >> + >> + phy0: ethernet-phy@0 { >> + reg = <0>; >> + }; >> + }; >> + >> + stmmac_axi_setup: stmmac-axi-config { >> + snps,lpi_en; >> + snps,wr_osr_lmt = <4>; >> + snps,rd_osr_lmt = <4>; >> + snps,blen = <256 128 64 32 0 0 0>; >> + }; >> + }; >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 5c67c75a940f..4e236b7c7fd2 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -19912,6 +19912,12 @@ M: Emil Renner Berthing <kernel@esmil.dk> >> S: Maintained >> F: arch/riscv/boot/dts/starfive/ >> >> +STARFIVE DWMAC GLUE LAYER >> +M: Emil Renner Berthing <kernel@esmil.dk> >> +M: Samin Guo <samin.guo@starfivetech.com> >> +S: Maintained >> +F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >> + >> STARFIVE JH71X0 CLOCK DRIVERS >> M: Emil Renner Berthing <kernel@esmil.dk> >> M: Hal Feng <hal.feng@starfivetech.com> >> -- >> 2.17.1 >>
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 89099a888f0b..395f081161ce 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -91,6 +91,7 @@ properties: - snps,dwmac-5.20 - snps,dwxgmac - snps,dwxgmac-2.10 + - starfive,jh7110-dwmac reg: minItems: 1 diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml new file mode 100644 index 000000000000..ca49f08d50dd --- /dev/null +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml @@ -0,0 +1,117 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2022 StarFive Technology Co., Ltd. +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/starfive,jh7110-dwmac.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: StarFive JH7110 DWMAC glue layer + +maintainers: + - Emil Renner Berthing <kernel@esmil.dk> + - Samin Guo <samin.guo@starfivetech.com> + +select: + properties: + compatible: + contains: + enum: + - starfive,jh7110-dwmac + required: + - compatible + +properties: + compatible: + items: + - enum: + - starfive,jh7110-dwmac + - const: snps,dwmac-5.20 + + clocks: + items: + - description: GMAC main clock + - description: GMAC AHB clock + - description: PTP clock + - description: TX clock + - description: GTX clock + + clock-names: + items: + - const: stmmaceth + - const: pclk + - const: ptp_ref + - const: tx + - const: gtx + + 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. + type: boolean + +allOf: + - $ref: snps,dwmac.yaml# + +unevaluatedProperties: true + +required: + - compatible + - clocks + - clock-names + - resets + - reset-names + +examples: + - | + ethernet@16030000 { + compatible = "starfive,jh7110-dwmac", "snps,dwmac-5.20"; + reg = <0x16030000 0x10000>; + clocks = <&clk 3>, <&clk 2>, <&clk 109>, + <&clk 6>, <&clk 111>; + clock-names = "stmmaceth", "pclk", "ptp_ref", + "tx", "gtx"; + resets = <&rst 1>, <&rst 2>; + reset-names = "stmmaceth", "ahb"; + interrupts = <7>, <6>, <5>; + interrupt-names = "macirq", "eth_wake_irq", "eth_lpi"; + phy-mode = "rgmii-id"; + snps,multicast-filter-bins = <64>; + snps,perfect-filter-entries = <8>; + rx-fifo-depth = <2048>; + tx-fifo-depth = <2048>; + snps,fixed-burst; + snps,no-pbl-x8; + snps,tso; + snps,force_thresh_dma_mode; + snps,axi-config = <&stmmac_axi_setup>; + snps,en-tx-lpi-clockgating; + snps,txpbl = <16>; + snps,rxpbl = <16>; + phy-handle = <&phy0>; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + compatible = "snps,dwmac-mdio"; + + phy0: ethernet-phy@0 { + reg = <0>; + }; + }; + + stmmac_axi_setup: stmmac-axi-config { + snps,lpi_en; + snps,wr_osr_lmt = <4>; + snps,rd_osr_lmt = <4>; + snps,blen = <256 128 64 32 0 0 0>; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 5c67c75a940f..4e236b7c7fd2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19912,6 +19912,12 @@ M: Emil Renner Berthing <kernel@esmil.dk> S: Maintained F: arch/riscv/boot/dts/starfive/ +STARFIVE DWMAC GLUE LAYER +M: Emil Renner Berthing <kernel@esmil.dk> +M: Samin Guo <samin.guo@starfivetech.com> +S: Maintained +F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml + STARFIVE JH71X0 CLOCK DRIVERS M: Emil Renner Berthing <kernel@esmil.dk> M: Hal Feng <hal.feng@starfivetech.com>