Commit aa58c9bc authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Mediatek-mt8188' 



Jianguo Zhang says:

====================
Mediatek ethernet patches for mt8188

Changes in v7:

v7:
1) Add 'Reviewed-by: AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>' info in commit message of
patch 'dt-bindings: net: snps,dwmac: add new property snps,clk-csr',
'arm64: dts: mediatek: mt2712e: Update the name of property 'clk_csr''
and 'net: stmmac: add a parse for new property 'snps,clk-csr''.

v6:
1) Update commit message of patch 'dt-bindings: net: snps,dwmac: add new property snps,clk-csr'
2) Add a parse for new property 'snps,clk-csr' in patch
'net: stmmac: add a parse for new property 'snps,clk-csr''

v5:
1) Rename the property 'clk_csr' as 'snps,clk-csr' in binding
file as Krzysztof Kozlowski'comment.
2) Add DTS patch 'arm64: dts: mediatek: mt2712e: Update the name of property 'clk_csr''
as Krzysztof Kozlowski'comment.
3) Add driver patch 'net: stmmac: Update the name of property 'clk_csr''
as Krzysztof Kozlowski'comment.

v4:
1) Update the commit message of patch 'dt-bindings: net: snps,dwmac: add clk_csr property'
as Krzysztof Kozlowski'comment.

v3:
1) List the names of SoCs mt8188 and mt8195 in correct order as
AngeloGioacchino Del Regno's comment.
2) Add patch version info as Krzysztof Kozlowski'comment.

v2:
1) Delete patch 'stmmac: dwmac-mediatek: add support for mt8188' as
Krzysztof Kozlowski's comment.
2) Update patch 'dt-bindings: net: mediatek-dwmac: add support for
mt8188' as Krzysztof Kozlowski's comment.
3) Add clk_csr property to fix warning ('clk_csr' was unexpected) when
runnig 'make dtbs_check'.

v1:
1) Add ethernet driver entry for mt8188.
2) Add binding document for ethernet on mt8188.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fd01b9b5 83936ea8

Documentation/devicetree/bindings/net/mediatek-dwmac.yaml

+8 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ select: 
      contains:

        enum:

          - mediatek,mt2712-gmac

          - mediatek,mt8188-gmac

          - mediatek,mt8195-gmac

  required:

    - compatible
@@ -37,6 +38,11 @@ properties: 
          - enum:

              - mediatek,mt8195-gmac

          - const: snps,dwmac-5.10a

      - items:

          - enum:

              - mediatek,mt8188-gmac

          - const: mediatek,mt8195-gmac

          - const: snps,dwmac-5.10a



  clocks:

    minItems: 5
@@ -74,7 +80,7 @@ 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,

      For MT8188/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:
@@ -84,7 +90,7 @@ 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

      For MT8188/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:

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

+5 −0
Original line number Diff line number Diff line
@@ -289,6 +289,11 @@ properties: 
      is supported. For example, this is used in case of SGMII and

      MAC2MAC connection.



  snps,clk-csr:

    $ref: /schemas/types.yaml#/definitions/uint32

    description:

      Frequency division factor for MDC clock.



  mdio:

    $ref: mdio.yaml#

    unevaluatedProperties: false

arch/arm64/boot/dts/mediatek/mt2712e.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ 
		snps,mtl-tx-config = <&mtl_tx_setup>;

		snps,txpbl = <1>;

		snps,rxpbl = <1>;

		clk_csr = <0>;

		snps,clk-csr = <0>;

		status = "disabled";

	};

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

+2 −1
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) 
	 * or get clk_csr from device tree.

	 */

	plat->clk_csr = -1;

	if (of_property_read_u32(np, "snps,clk-csr", &plat->clk_csr))

		of_property_read_u32(np, "clk_csr", &plat->clk_csr);



	/* "snps,phy-addr" is not a standard property. Mark it as deprecated