* [PATCH v2 0/2] StarFive DWMAC support for JH7100 @ 2023-12-20 0:28 Cristian Ciocaltea 2023-12-20 0:28 ` [PATCH v2 1/2] dt-bindings: net: starfive,jh7110-dwmac: Add JH7100 SoC compatible Cristian Ciocaltea 2023-12-20 0:28 ` [PATCH v2 2/2] net: stmmac: dwmac-starfive: Add support for JH7100 SoC Cristian Ciocaltea 0 siblings, 2 replies; 6+ messages in thread From: Cristian Ciocaltea @ 2023-12-20 0:28 UTC (permalink / raw) To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Emil Renner Berthing, Samin Guo, Alexandre Torgue, Jose Abreu, Maxime Coquelin, Giuseppe Cavallaro, Andrew Lunn, Jacob Keller Cc: netdev, devicetree, linux-kernel, linux-stm32, linux-arm-kernel, kernel This is just a subset of the initial patch series [1] adding networking support for StarFive JH7100 SoC. [1]: https://lore.kernel.org/lkml/20231218214451.2345691-1-cristian.ciocaltea@collabora.com/ Changes in v2: - Add the missing binding patch Cristian Ciocaltea (2): dt-bindings: net: starfive,jh7110-dwmac: Add JH7100 SoC compatible net: stmmac: dwmac-starfive: Add support for JH7100 SoC .../devicetree/bindings/net/snps,dwmac.yaml | 11 ++- .../bindings/net/starfive,jh7110-dwmac.yaml | 75 +++++++++++++------ drivers/net/ethernet/stmicro/stmmac/Kconfig | 6 +- .../ethernet/stmicro/stmmac/dwmac-starfive.c | 32 +++++++- 4 files changed, 91 insertions(+), 33 deletions(-) -- 2.43.0 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] dt-bindings: net: starfive,jh7110-dwmac: Add JH7100 SoC compatible 2023-12-20 0:28 [PATCH v2 0/2] StarFive DWMAC support for JH7100 Cristian Ciocaltea @ 2023-12-20 0:28 ` Cristian Ciocaltea 2023-12-20 22:12 ` Jacob Keller 2023-12-21 22:21 ` Rob Herring 2023-12-20 0:28 ` [PATCH v2 2/2] net: stmmac: dwmac-starfive: Add support for JH7100 SoC Cristian Ciocaltea 1 sibling, 2 replies; 6+ messages in thread From: Cristian Ciocaltea @ 2023-12-20 0:28 UTC (permalink / raw) To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Emil Renner Berthing, Samin Guo, Alexandre Torgue, Jose Abreu, Maxime Coquelin, Giuseppe Cavallaro, Andrew Lunn, Jacob Keller Cc: netdev, devicetree, linux-kernel, linux-stm32, linux-arm-kernel, kernel The Synopsys DesignWare MAC found on StarFive JH7100 SoC is mostly similar to the newer JH7110, but it requires only two interrupts and a single reset line, which is 'ahb' instead of the commonly used 'stmmaceth'. Since the common binding 'snps,dwmac' allows selecting 'ahb' only in conjunction with 'stmmaceth', extend the logic to also permit exclusive usage of the 'ahb' reset name. This ensures the following use cases are supported: JH7110: reset-names = "stmmaceth", "ahb"; JH7100: reset-names = "ahb"; other: reset-names = "stmmaceth"; Also note the need to use a different dwmac fallback, as v5.20 applies to JH7110 only, while JH7100 relies on v3.7x. Additionally, drop the reset description items from top-level binding as they are already provided by the included snps,dwmac schema. Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> --- .../devicetree/bindings/net/snps,dwmac.yaml | 11 ++- .../bindings/net/starfive,jh7110-dwmac.yaml | 75 +++++++++++++------ 2 files changed, 60 insertions(+), 26 deletions(-) diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 5c2769dc689a..90c4db178c67 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -95,6 +95,7 @@ properties: - snps,dwmac-5.20 - snps,dwxgmac - snps,dwxgmac-2.10 + - starfive,jh7100-dwmac - starfive,jh7110-dwmac reg: @@ -144,10 +145,12 @@ properties: - description: AHB reset reset-names: - minItems: 1 - items: - - const: stmmaceth - - const: ahb + oneOf: + - items: + - enum: [stmmaceth, ahb] + - items: + - const: stmmaceth + - const: ahb power-domains: maxItems: 1 diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml index 5e7cfbbebce6..f5f0bff5be0f 100644 --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml @@ -16,16 +16,20 @@ select: compatible: contains: enum: + - starfive,jh7100-dwmac - starfive,jh7110-dwmac required: - compatible properties: compatible: - items: - - enum: - - starfive,jh7110-dwmac - - const: snps,dwmac-5.20 + oneOf: + - items: + - const: starfive,jh7100-dwmac + - const: snps,dwmac + - items: + - const: starfive,jh7110-dwmac + - const: snps,dwmac-5.20 reg: maxItems: 1 @@ -46,24 +50,6 @@ properties: - 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. @@ -94,6 +80,51 @@ required: allOf: - $ref: snps,dwmac.yaml# + - if: + properties: + compatible: + contains: + const: starfive,jh7100-dwmac + then: + properties: + interrupts: + minItems: 2 + maxItems: 2 + + interrupt-names: + minItems: 2 + maxItems: 2 + + resets: + maxItems: 1 + + reset-names: + const: ahb + + - if: + properties: + compatible: + contains: + const: starfive,jh7110-dwmac + then: + properties: + interrupts: + minItems: 3 + maxItems: 3 + + interrupt-names: + minItems: 3 + maxItems: 3 + + resets: + minItems: 2 + maxItems: 2 + + reset-names: + items: + - const: stmmaceth + - const: ahb + unevaluatedProperties: false examples: -- 2.43.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: net: starfive,jh7110-dwmac: Add JH7100 SoC compatible 2023-12-20 0:28 ` [PATCH v2 1/2] dt-bindings: net: starfive,jh7110-dwmac: Add JH7100 SoC compatible Cristian Ciocaltea @ 2023-12-20 22:12 ` Jacob Keller 2023-12-21 22:21 ` Rob Herring 1 sibling, 0 replies; 6+ messages in thread From: Jacob Keller @ 2023-12-20 22:12 UTC (permalink / raw) To: Cristian Ciocaltea, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Emil Renner Berthing, Samin Guo, Alexandre Torgue, Jose Abreu, Maxime Coquelin, Giuseppe Cavallaro, Andrew Lunn Cc: netdev, devicetree, linux-kernel, linux-stm32, linux-arm-kernel, kernel On 12/19/2023 4:28 PM, Cristian Ciocaltea wrote: > The Synopsys DesignWare MAC found on StarFive JH7100 SoC is mostly > similar to the newer JH7110, but it requires only two interrupts and a > single reset line, which is 'ahb' instead of the commonly used > 'stmmaceth'. > > Since the common binding 'snps,dwmac' allows selecting 'ahb' only in > conjunction with 'stmmaceth', extend the logic to also permit exclusive > usage of the 'ahb' reset name. This ensures the following use cases are > supported: > > JH7110: reset-names = "stmmaceth", "ahb"; > JH7100: reset-names = "ahb"; > other: reset-names = "stmmaceth"; > > Also note the need to use a different dwmac fallback, as v5.20 applies > to JH7110 only, while JH7100 relies on v3.7x. > > Additionally, drop the reset description items from top-level binding as > they are already provided by the included snps,dwmac schema. > > Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> > --- Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: net: starfive,jh7110-dwmac: Add JH7100 SoC compatible 2023-12-20 0:28 ` [PATCH v2 1/2] dt-bindings: net: starfive,jh7110-dwmac: Add JH7100 SoC compatible Cristian Ciocaltea 2023-12-20 22:12 ` Jacob Keller @ 2023-12-21 22:21 ` Rob Herring 2023-12-22 0:25 ` Cristian Ciocaltea 1 sibling, 1 reply; 6+ messages in thread From: Rob Herring @ 2023-12-21 22:21 UTC (permalink / raw) To: Cristian Ciocaltea Cc: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Krzysztof Kozlowski, Conor Dooley, Emil Renner Berthing, Samin Guo, Alexandre Torgue, Jose Abreu, Maxime Coquelin, Giuseppe Cavallaro, Andrew Lunn, Jacob Keller, netdev, devicetree, linux-kernel, linux-stm32, linux-arm-kernel, kernel On Wed, Dec 20, 2023 at 02:28:22AM +0200, Cristian Ciocaltea wrote: > The Synopsys DesignWare MAC found on StarFive JH7100 SoC is mostly > similar to the newer JH7110, but it requires only two interrupts and a > single reset line, which is 'ahb' instead of the commonly used > 'stmmaceth'. > > Since the common binding 'snps,dwmac' allows selecting 'ahb' only in > conjunction with 'stmmaceth', extend the logic to also permit exclusive > usage of the 'ahb' reset name. This ensures the following use cases are > supported: > > JH7110: reset-names = "stmmaceth", "ahb"; > JH7100: reset-names = "ahb"; > other: reset-names = "stmmaceth"; > > Also note the need to use a different dwmac fallback, as v5.20 applies > to JH7110 only, while JH7100 relies on v3.7x. > > Additionally, drop the reset description items from top-level binding as > they are already provided by the included snps,dwmac schema. > > Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> > --- > .../devicetree/bindings/net/snps,dwmac.yaml | 11 ++- > .../bindings/net/starfive,jh7110-dwmac.yaml | 75 +++++++++++++------ > 2 files changed, 60 insertions(+), 26 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > index 5c2769dc689a..90c4db178c67 100644 > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > @@ -95,6 +95,7 @@ properties: > - snps,dwmac-5.20 > - snps,dwxgmac > - snps,dwxgmac-2.10 > + - starfive,jh7100-dwmac > - starfive,jh7110-dwmac > > reg: > @@ -144,10 +145,12 @@ properties: > - description: AHB reset > > reset-names: > - minItems: 1 > - items: > - - const: stmmaceth > - - const: ahb > + oneOf: > + - items: > + - enum: [stmmaceth, ahb] > + - items: > + - const: stmmaceth > + - const: ahb > > power-domains: > maxItems: 1 > diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > index 5e7cfbbebce6..f5f0bff5be0f 100644 > --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml > @@ -16,16 +16,20 @@ select: > compatible: > contains: > enum: > + - starfive,jh7100-dwmac > - starfive,jh7110-dwmac > required: > - compatible > > properties: > compatible: > - items: > - - enum: > - - starfive,jh7110-dwmac > - - const: snps,dwmac-5.20 > + oneOf: > + - items: > + - const: starfive,jh7100-dwmac > + - const: snps,dwmac > + - items: > + - const: starfive,jh7110-dwmac > + - const: snps,dwmac-5.20 > > reg: > maxItems: 1 > @@ -46,24 +50,6 @@ properties: > - 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. > @@ -94,6 +80,51 @@ required: > allOf: > - $ref: snps,dwmac.yaml# > > + - if: > + properties: > + compatible: > + contains: > + const: starfive,jh7100-dwmac > + then: > + properties: > + interrupts: > + minItems: 2 > + maxItems: 2 > + > + interrupt-names: > + minItems: 2 > + maxItems: 2 > + > + resets: > + maxItems: 1 > + > + reset-names: > + const: ahb Just 'maxItems: 1' > + > + - if: > + properties: > + compatible: > + contains: > + const: starfive,jh7110-dwmac > + then: > + properties: > + interrupts: > + minItems: 3 > + maxItems: 3 > + > + interrupt-names: > + minItems: 3 > + maxItems: 3 > + > + resets: > + minItems: 2 > + maxItems: 2 max is already 2. Drop. > + > + reset-names: > + items: > + - const: stmmaceth > + - const: ahb Already defined the names. Just 'minItems: 2'. > + > unevaluatedProperties: false > > examples: > -- > 2.43.0 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: net: starfive,jh7110-dwmac: Add JH7100 SoC compatible 2023-12-21 22:21 ` Rob Herring @ 2023-12-22 0:25 ` Cristian Ciocaltea 0 siblings, 0 replies; 6+ messages in thread From: Cristian Ciocaltea @ 2023-12-22 0:25 UTC (permalink / raw) To: Rob Herring Cc: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Krzysztof Kozlowski, Conor Dooley, Emil Renner Berthing, Samin Guo, Alexandre Torgue, Jose Abreu, Maxime Coquelin, Giuseppe Cavallaro, Andrew Lunn, Jacob Keller, netdev, devicetree, linux-kernel, linux-stm32, linux-arm-kernel, kernel On 12/22/23 00:21, Rob Herring wrote: > On Wed, Dec 20, 2023 at 02:28:22AM +0200, Cristian Ciocaltea wrote: >> The Synopsys DesignWare MAC found on StarFive JH7100 SoC is mostly >> similar to the newer JH7110, but it requires only two interrupts and a >> single reset line, which is 'ahb' instead of the commonly used >> 'stmmaceth'. >> >> Since the common binding 'snps,dwmac' allows selecting 'ahb' only in >> conjunction with 'stmmaceth', extend the logic to also permit exclusive >> usage of the 'ahb' reset name. This ensures the following use cases are >> supported: >> >> JH7110: reset-names = "stmmaceth", "ahb"; >> JH7100: reset-names = "ahb"; >> other: reset-names = "stmmaceth"; >> >> Also note the need to use a different dwmac fallback, as v5.20 applies >> to JH7110 only, while JH7100 relies on v3.7x. >> >> Additionally, drop the reset description items from top-level binding as >> they are already provided by the included snps,dwmac schema. >> >> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> >> --- >> .../devicetree/bindings/net/snps,dwmac.yaml | 11 ++- >> .../bindings/net/starfive,jh7110-dwmac.yaml | 75 +++++++++++++------ >> 2 files changed, 60 insertions(+), 26 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml >> index 5c2769dc689a..90c4db178c67 100644 >> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml >> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml >> @@ -95,6 +95,7 @@ properties: >> - snps,dwmac-5.20 >> - snps,dwxgmac >> - snps,dwxgmac-2.10 >> + - starfive,jh7100-dwmac >> - starfive,jh7110-dwmac >> >> reg: >> @@ -144,10 +145,12 @@ properties: >> - description: AHB reset >> >> reset-names: >> - minItems: 1 >> - items: >> - - const: stmmaceth >> - - const: ahb >> + oneOf: >> + - items: >> + - enum: [stmmaceth, ahb] >> + - items: >> + - const: stmmaceth >> + - const: ahb >> >> power-domains: >> maxItems: 1 >> diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >> index 5e7cfbbebce6..f5f0bff5be0f 100644 >> --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >> +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >> @@ -16,16 +16,20 @@ select: >> compatible: >> contains: >> enum: >> + - starfive,jh7100-dwmac >> - starfive,jh7110-dwmac >> required: >> - compatible >> >> properties: >> compatible: >> - items: >> - - enum: >> - - starfive,jh7110-dwmac >> - - const: snps,dwmac-5.20 >> + oneOf: >> + - items: >> + - const: starfive,jh7100-dwmac >> + - const: snps,dwmac >> + - items: >> + - const: starfive,jh7110-dwmac >> + - const: snps,dwmac-5.20 >> >> reg: >> maxItems: 1 >> @@ -46,24 +50,6 @@ properties: >> - 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. >> @@ -94,6 +80,51 @@ required: >> allOf: >> - $ref: snps,dwmac.yaml# >> >> + - if: >> + properties: >> + compatible: >> + contains: >> + const: starfive,jh7100-dwmac >> + then: >> + properties: >> + interrupts: >> + minItems: 2 >> + maxItems: 2 >> + >> + interrupt-names: >> + minItems: 2 >> + maxItems: 2 >> + >> + resets: >> + maxItems: 1 >> + >> + reset-names: >> + const: ahb > > Just 'maxItems: 1' This would allow using either 'ahb' or 'stmmaceth', while only the former should be permitted. No issues with the other two optimizations, will be handled in v3. Thank you for reviewing, Cristian >> + >> + - if: >> + properties: >> + compatible: >> + contains: >> + const: starfive,jh7110-dwmac >> + then: >> + properties: >> + interrupts: >> + minItems: 3 >> + maxItems: 3 >> + >> + interrupt-names: >> + minItems: 3 >> + maxItems: 3 >> + >> + resets: >> + minItems: 2 >> + maxItems: 2 > > max is already 2. Drop. > >> + >> + reset-names: >> + items: >> + - const: stmmaceth >> + - const: ahb > > Already defined the names. Just 'minItems: 2'. > >> + >> unevaluatedProperties: false >> >> examples: >> -- >> 2.43.0 >> ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] net: stmmac: dwmac-starfive: Add support for JH7100 SoC 2023-12-20 0:28 [PATCH v2 0/2] StarFive DWMAC support for JH7100 Cristian Ciocaltea 2023-12-20 0:28 ` [PATCH v2 1/2] dt-bindings: net: starfive,jh7110-dwmac: Add JH7100 SoC compatible Cristian Ciocaltea @ 2023-12-20 0:28 ` Cristian Ciocaltea 1 sibling, 0 replies; 6+ messages in thread From: Cristian Ciocaltea @ 2023-12-20 0:28 UTC (permalink / raw) To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Emil Renner Berthing, Samin Guo, Alexandre Torgue, Jose Abreu, Maxime Coquelin, Giuseppe Cavallaro, Andrew Lunn, Jacob Keller Cc: netdev, devicetree, linux-kernel, linux-stm32, linux-arm-kernel, kernel Add a missing quirk to enable support for the StarFive JH7100 SoC. Additionally, for greater flexibility in operation, allow using the rgmii-rxid and rgmii-txid phy modes. Co-developed-by: Emil Renner Berthing <kernel@esmil.dk> Signed-off-by: Emil Renner Berthing <kernel@esmil.dk> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> --- drivers/net/ethernet/stmicro/stmmac/Kconfig | 6 ++-- .../ethernet/stmicro/stmmac/dwmac-starfive.c | 32 ++++++++++++++++--- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig index 85dcda51df05..4ec61f1ee71a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -165,9 +165,9 @@ config DWMAC_STARFIVE help Support for ethernet controllers on StarFive RISC-V SoCs - This selects the StarFive platform specific glue layer support for - the stmmac device driver. This driver is used for StarFive JH7110 - ethernet controller. + This selects the StarFive platform specific glue layer support + for the stmmac device driver. This driver is used for the + StarFive JH7100 and JH7110 ethernet controllers. config DWMAC_STI tristate "STi GMAC support" diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c index 5d630affb4d1..4e1076faee0c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c @@ -15,13 +15,20 @@ #include "stmmac_platform.h" -#define STARFIVE_DWMAC_PHY_INFT_RGMII 0x1 -#define STARFIVE_DWMAC_PHY_INFT_RMII 0x4 -#define STARFIVE_DWMAC_PHY_INFT_FIELD 0x7U +#define STARFIVE_DWMAC_PHY_INFT_RGMII 0x1 +#define STARFIVE_DWMAC_PHY_INFT_RMII 0x4 +#define STARFIVE_DWMAC_PHY_INFT_FIELD 0x7U + +#define JH7100_SYSMAIN_REGISTER49_DLYCHAIN 0xc8 + +struct starfive_dwmac_data { + unsigned int gtxclk_dlychain; +}; struct starfive_dwmac { struct device *dev; struct clk *clk_tx; + const struct starfive_dwmac_data *data; }; static void starfive_dwmac_fix_mac_speed(void *priv, unsigned int speed, unsigned int mode) @@ -67,6 +74,8 @@ static int starfive_dwmac_set_mode(struct plat_stmmacenet_data *plat_dat) case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII_ID: + case PHY_INTERFACE_MODE_RGMII_RXID: + case PHY_INTERFACE_MODE_RGMII_TXID: mode = STARFIVE_DWMAC_PHY_INFT_RGMII; break; @@ -89,6 +98,14 @@ static int starfive_dwmac_set_mode(struct plat_stmmacenet_data *plat_dat) if (err) return dev_err_probe(dwmac->dev, err, "error setting phy mode\n"); + if (dwmac->data) { + err = regmap_write(regmap, JH7100_SYSMAIN_REGISTER49_DLYCHAIN, + dwmac->data->gtxclk_dlychain); + if (err) + return dev_err_probe(dwmac->dev, err, + "error selecting gtxclk delay chain\n"); + } + return 0; } @@ -114,6 +131,8 @@ static int starfive_dwmac_probe(struct platform_device *pdev) if (!dwmac) return -ENOMEM; + dwmac->data = device_get_match_data(&pdev->dev); + dwmac->clk_tx = devm_clk_get_enabled(&pdev->dev, "tx"); if (IS_ERR(dwmac->clk_tx)) return dev_err_probe(&pdev->dev, PTR_ERR(dwmac->clk_tx), @@ -144,8 +163,13 @@ static int starfive_dwmac_probe(struct platform_device *pdev) return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); } +static const struct starfive_dwmac_data jh7100_data = { + .gtxclk_dlychain = 4, +}; + static const struct of_device_id starfive_dwmac_match[] = { - { .compatible = "starfive,jh7110-dwmac" }, + { .compatible = "starfive,jh7100-dwmac", .data = &jh7100_data }, + { .compatible = "starfive,jh7110-dwmac" }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, starfive_dwmac_match); -- 2.43.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-12-22 0:25 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-12-20 0:28 [PATCH v2 0/2] StarFive DWMAC support for JH7100 Cristian Ciocaltea 2023-12-20 0:28 ` [PATCH v2 1/2] dt-bindings: net: starfive,jh7110-dwmac: Add JH7100 SoC compatible Cristian Ciocaltea 2023-12-20 22:12 ` Jacob Keller 2023-12-21 22:21 ` Rob Herring 2023-12-22 0:25 ` Cristian Ciocaltea 2023-12-20 0:28 ` [PATCH v2 2/2] net: stmmac: dwmac-starfive: Add support for JH7100 SoC Cristian Ciocaltea
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox