Commit cd258940 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'riscv-sophgo-add-ethernet-support-for-sg2042' 

Inochi Amaoto says:

====================
riscv: sophgo: Add ethernet support for SG2042

The ethernet controller of SG2042 is Synopsys DesignWare IP with
tx clock. Add device id for it.

This patch can only be tested on a SG2042 evb board, as pioneer
does not expose this device.

The user dts patch link:
https://lore.kernel.org/linux-riscv/cover.1751700954.git.rabenda.cn@gmail.com
====================

Link: https://patch.msgid.link/20250708064052.507094-1-inochiama@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a6f12204 d40c1ddd

Documentation/devicetree/bindings/net/snps,dwmac.yaml

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ select: 
          - snps,dwmac-4.00

          - snps,dwmac-4.10a

          - snps,dwmac-4.20a

          - snps,dwmac-5.00a

          - snps,dwmac-5.10a

          - snps,dwmac-5.20

          - snps,dwmac-5.30a
@@ -98,11 +99,13 @@ properties: 
        - snps,dwmac-4.00

        - snps,dwmac-4.10a

        - snps,dwmac-4.20a

        - snps,dwmac-5.00a

        - snps,dwmac-5.10a

        - snps,dwmac-5.20

        - snps,dwmac-5.30a

        - snps,dwxgmac

        - snps,dwxgmac-2.10

        - sophgo,sg2042-dwmac

        - sophgo,sg2044-dwmac

        - starfive,jh7100-dwmac

        - starfive,jh7110-dwmac
@@ -641,6 +644,7 @@ allOf: 
                - snps,dwmac-4.00

                - snps,dwmac-4.10a

                - snps,dwmac-4.20a

                - snps,dwmac-5.00a

                - snps,dwmac-5.10a

                - snps,dwmac-5.20

                - snps,dwmac-5.30a

Documentation/devicetree/bindings/net/sophgo,sg2044-dwmac.yaml

+8 −3
Original line number Diff line number Diff line
@@ -15,12 +15,17 @@ select: 
      contains:

        enum:

          - sophgo,sg2044-dwmac

          - sophgo,sg2042-dwmac

  required:

    - compatible



properties:

  compatible:

    items:

    oneOf:

      - items:

          - const: sophgo,sg2042-dwmac

          - const: snps,dwmac-5.00a

      - items:

          - const: sophgo,sg2044-dwmac

          - const: snps,dwmac-5.30a

drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ static int sophgo_dwmac_probe(struct platform_device *pdev) 
}



static const struct of_device_id sophgo_dwmac_match[] = {

	{ .compatible = "sophgo,sg2042-dwmac" },

	{ .compatible = "sophgo,sg2044-dwmac" },

	{ /* sentinel */ }

};

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ static const char * const stmmac_gmac4_compats[] = { 
	"snps,dwmac-4.00",

	"snps,dwmac-4.10a",

	"snps,dwmac-4.20a",

	"snps,dwmac-5.00a",

	"snps,dwmac-5.10a",

	"snps,dwmac-5.20",

	"snps,dwmac-5.30a",