| Message ID | 20230324022819.2324-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, 24 Mar 2023 10:28:17 +0800 Samin Guo wrote: > diff --git a/MAINTAINERS b/MAINTAINERS > index ebc97c6c922f..5c6d53a9f62a 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -19905,6 +19905,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 JH7110 MMC/SD/SDIO DRIVER > M: William Qiu <william.qiu@starfivetech.com> > S: Supported The context is wrong here, could you regen the series on top of net-next (and resend with [PATCH net-next v9] in the subject while at it)?
Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac From: Jakub Kicinski <kuba@kernel.org> to: Samin Guo <samin.guo@starfivetech.com> data: 2023/3/25 > On Fri, 24 Mar 2023 10:28:17 +0800 Samin Guo wrote: >> diff --git a/MAINTAINERS b/MAINTAINERS >> index ebc97c6c922f..5c6d53a9f62a 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -19905,6 +19905,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 JH7110 MMC/SD/SDIO DRIVER >> M: William Qiu <william.qiu@starfivetech.com> >> S: Supported > > The context is wrong here, could you regen the series on top of > net-next (and resend with [PATCH net-next v9] in the subject while > at it)? Hi Jakub, Thanks, I will resent with [PATCH net-next v9]. My series of patches will depend on Hal's minimal system[1] and william's syscon patch[2], and this context comes from their patch. [1]: https://patchwork.kernel.org/project/linux-riscv/cover/20230320103750.60295-1-hal.feng@starfivetech.com [2]: https://patchwork.kernel.org/project/linux-riscv/cover/20230315055813.94740-1-william.qiu@starfivetech.com Do I need to remove their context? Best regards, Samin
On Mon, 27 Mar 2023 09:53:22 +0800 Guo Samin wrote: > Thanks, I will resent with [PATCH net-next v9]. > My series of patches will depend on Hal's minimal system[1] and william's syscon patch[2], and this context comes from their patch. > > [1]: https://patchwork.kernel.org/project/linux-riscv/cover/20230320103750.60295-1-hal.feng@starfivetech.com > [2]: https://patchwork.kernel.org/project/linux-riscv/cover/20230315055813.94740-1-william.qiu@starfivetech.com > > Do I need to remove their context? If the conflict is just on MAINTAINERS it should be safe to ignore. Resend your patches on top of net-next as if their patches didn't exist. Stephen/Linus will have not trouble resolving the conflict.
Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac From: Jakub Kicinski <kuba@kernel.org> to: Guo Samin <samin.guo@starfivetech.com> data: 2023/3/28 > On Mon, 27 Mar 2023 09:53:22 +0800 Guo Samin wrote: >> Thanks, I will resent with [PATCH net-next v9]. >> My series of patches will depend on Hal's minimal system[1] and william's syscon patch[2], and this context comes from their patch. >> >> [1]: https://patchwork.kernel.org/project/linux-riscv/cover/20230320103750.60295-1-hal.feng@starfivetech.com >> [2]: https://patchwork.kernel.org/project/linux-riscv/cover/20230315055813.94740-1-william.qiu@starfivetech.com >> >> Do I need to remove their context? > > If the conflict is just on MAINTAINERS it should be safe to ignore. > Resend your patches on top of net-next as if their patches didn't > exist. Stephen/Linus will have not trouble resolving the conflict. I see, I'll send net-next as you suggest. Best regards, Samin
On 24/03/2023 03:28, 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> > + starfive,syscon: > + $ref: /schemas/types.yaml#/definitions/phandle-array > + items: > + - items: > + - description: phandle to syscon that configures phy mode > + - description: Offset of phy mode selection > + - description: Shift of phy mode selection > + description: > + A phandle to syscon with two arguments that configure phy mode. > + The argument one is the offset of phy mode selection, the > + argument two is the shift of phy mode selection. > + > +allOf: > + - $ref: snps,dwmac.yaml# > + > +unevaluatedProperties: false > + > +required: > + - compatible > + - reg > + - clocks > + - clock-names > + - interrupts > + - interrupt-names > + - resets > + - reset-names required: goes after properties: Just like in example-schema. *With* fix above: Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index e4519cf722ab..245f7d713261 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..5861426032bd --- /dev/null +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml @@ -0,0 +1,144 @@ +# 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 + + reg: + maxItems: 1 + + 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 + + interrupts: + minItems: 3 + maxItems: 3 + + interrupt-names: + 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. + type: boolean + + starfive,syscon: + $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to syscon that configures phy mode + - description: Offset of phy mode selection + - description: Shift of phy mode selection + description: + A phandle to syscon with two arguments that configure phy mode. + The argument one is the offset of phy mode selection, the + argument two is the shift of phy mode selection. + +allOf: + - $ref: snps,dwmac.yaml# + +unevaluatedProperties: false + +required: + - compatible + - reg + - clocks + - clock-names + - interrupts + - interrupt-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>; + starfive,syscon = <&aon_syscon 0xc 0x12>; + 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 ebc97c6c922f..5c6d53a9f62a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19905,6 +19905,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 JH7110 MMC/SD/SDIO DRIVER M: William Qiu <william.qiu@starfivetech.com> S: Supported