MediaTek Ethernet Patches on MT8195
Subsystems (6)
v12 cover MediaTek Ethernet Patches on MT8195
Changes in v12:
1. add a new patch "stmmac: dwmac-mediatek: re-arrange clock setting" to this series, to simplify clock handling in driver, which benefits to binding file mediatek-dwmac.yaml.
2. modify dt-binding description in patch "net: dt-bindings: dwmac: add support for mt8195" as Rob's comments in v10 series, put mac_cg to the end of clock list.
3. there are small changes in patch "stmmac: dwmac-mediatek: add support for mt8195", @AngeloGioacchino, please review it kindly.
Changes in v11:
1. add reivewed-by in "net: dt-bindings: dwmac: Convert mediatek-dwmac to
DT schema" as Rob's comments.
2. fall back "net: dt-bindings: dwmac: add support for mt8195" to v8 version
as mentioned in previous reply(https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]/):
2.1 there is already a special clock named "rmii_internal", which need to
be put to the end of the clock list(driver special handling),
so we can't simply put new "mac_cg" for mt8195 to the end of the clock
list.
2.2 we prefer the if-then schema, which will make mt8195 clock list clearer
with some duplicated information.
2.3 we expect the future IC will follow mt2712 or mt8195, so we only need
add new IC name to compatible list for future IC, and will not make the
clock list binding files worse.
Changes in v10:
1. add detailed description in "arm64: dts: mt2712: update ethernet device node" to make the modifications clearer as Matthias's comments.
2. modify dt-binding description as Rob's comments, and "make dtbs_check" runs pass locally with "arm64: dts: mt2712: update ethernet device node" in this series.
Changes in v9:
1. remove oneOf for 1 entry as Rob's comments.
2. add new clocks to the end of existing clocks to simplify the binding as Rob's comments.
Changes in v8:
1. add acked-by in "stmmac: dwmac-mediatek: add platform level clocks management" patch
Changes in v7:
1. fix uninitialized warning as Jakub's comments.
Changes in v6:
1. update commit message as Jakub's comments.
2. split mt8195 eth dts patch("arm64: dts: mt8195: add ethernet device node") from this series, since mt8195 dtsi/dts basic patches is still under reviewing.
https://patchwork.kernel.org/project/linux-mediatek/list/?series=579071
we'll resend mt8195 eth dts patch once all the dependent patches are accepted.
Changes in v5:
1. remove useless inclusion in dwmac-mediatek.c as Angelo's comments.
2. add acked-by in "net-next: stmmac: dwmac-mediatek: add support for mt8195" patch
Changes in v4:
1. add changes in commit message in "net-next: dt-bindings: dwmac:
Convert mediatek-dwmac to DT schema" patch.
2. remove ethernet-controller.yaml since snps,dwmac.yaml already include it.
Changes in v3:
1. Add prefix "net-next" to support new IC as Denis's suggestion.
2. Split dt-bindings to two patches, one for conversion, and the other for new IC.
3. add a new patch to update device node in mt2712-evb.dts to accommodate to changes in driver.
4. remove unnecessary wrapper as Angelo's suggestion.
5. Add acked-by in "net-next: stmmac: dwmac-mediatek: Reuse more common features" patch.
Changes in v2:
1. fix errors/warnings in mediatek-dwmac.yaml with upgraded dtschema tools
Changes in v1:
This series include 5 patches:
1. add platform level clocks management for dwmac-mediatek
2. resue more common features defined in stmmac_platform.c
3. add ethernet entry for mt8195
Biao Huang (7):
stmmac: dwmac-mediatek: add platform level clocks management
stmmac: dwmac-mediatek: Reuse more common features
stmmac: dwmac-mediatek: re-arrange clock setting
arm64: dts: mt2712: update ethernet device node
net: dt-bindings: dwmac: Convert mediatek-dwmac to DT schema
stmmac: dwmac-mediatek: add support for mt8195
net: dt-bindings: dwmac: add support for mt8195
.../bindings/net/mediatek-dwmac.txt | 91 ---- .../bindings/net/mediatek-dwmac.yaml | 175 ++++++++ arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 1 + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 14 +- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 389 +++++++++++++++--- 5 files changed, 526 insertions(+), 144 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/mediatek-dwmac.txt create mode 100644 Documentation/devicetree/bindings/net/mediatek-dwmac.yaml
--
2.18.0
PATCH v12 1/7 stmmac: dwmac-mediatek: add platform level clocks management
This patch implements clks_config callback for dwmac-mediatek platform, which could support platform level clocks management.
--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +18 -7
@@ -9,7 +9,6 @@#include <linux/of.h> #include <linux/of_device.h> #include <linux/of_net.h> -#include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/stmmac.h>
@@ -359,9 +358,6 @@ static int mediatek_dwmac_init(struct platform_device *pdev, void *priv)return ret; } -pm_runtime_enable (&pdev->dev); -pm_runtime_get_sync (&pdev->dev); -return 0 ; }
@@ -370,11 +366,25 @@ static void mediatek_dwmac_exit(struct platform_device *pdev, void *priv)struct mediatek_dwmac_plat_data *plat = priv;clk_bulk_disable_unprepare (plat->num_clks_to_config, plat->clks); - -pm_runtime_put_sync (&pdev->dev); -pm_runtime_disable (&pdev->dev); } +static int mediatek_dwmac_clks_config (void *priv,bool enabled) +{ +struct mediatek_dwmac_plat_data *plat = priv; +int ret =0 ; + +if (enabled) { + ret =clk_bulk_prepare_enable (plat->num_clks_to_config, plat->clks); +if (ret) { +dev_err (plat->dev,"failed to enable clks, err = %d\n" , ret); +return ret; + } + }else { +clk_bulk_disable_unprepare (plat->num_clks_to_config, plat->clks); + } + +return ret; +}static int mediatek_dwmac_probe (struct platform_device *pdev) {struct mediatek_dwmac_plat_data *priv_plat;
@@ -420,6 +430,7 @@ static int mediatek_dwmac_probe(struct platform_device *pdev) plat_dat->bsp_priv = priv_plat; plat_dat->init = mediatek_dwmac_init; plat_dat->exit = mediatek_dwmac_exit; + plat_dat->clks_config = mediatek_dwmac_clks_config;mediatek_dwmac_init (pdev, priv_plat); ret =stmmac_dvr_probe (&pdev->dev, plat_dat, &stmmac_res);
Signature · 1 line
2.25.1
PATCH v12 2/7 stmmac: dwmac-mediatek: Reuse more common features
In reply to Biao HuangThis patch makes dwmac-mediatek reuse more features supported by stmmac_platform.c.
--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +15 -17
@@ -334,22 +334,20 @@ static int mediatek_dwmac_init(struct platform_device *pdev, void *priv)const struct mediatek_dwmac_variant *variant = plat->variant;int ret; - ret =dma_set_mask_and_coherent (plat->dev,DMA_BIT_MASK (variant->dma_bit_mask)); -if (ret) { -dev_err (plat->dev,"No suitable DMA available, err = %d\n" , ret); -return ret; - } - - ret = variant->dwmac_set_phy_interface (plat); -if (ret) { -dev_err (plat->dev,"failed to set phy interface, err = %d\n" , ret); -return ret; +if (variant->dwmac_set_phy_interface) { + ret = variant->dwmac_set_phy_interface (plat); +if (ret) { +dev_err (plat->dev,"failed to set phy interface, err = %d\n" , ret); +return ret; + } } - ret = variant->dwmac_set_delay (plat); -if (ret) { -dev_err (plat->dev,"failed to set delay value, err = %d\n" , ret); -return ret; +if (variant->dwmac_set_delay) { + ret = variant->dwmac_set_delay (plat); +if (ret) { +dev_err (plat->dev,"failed to set delay value, err = %d\n" , ret); +return ret; + } } ret =clk_bulk_prepare_enable (plat->num_clks_to_config, plat->clks);
@@ -422,15 +420,15 @@ static int mediatek_dwmac_probe(struct platform_device *pdev)return PTR_ERR (plat_dat); plat_dat->interface = priv_plat->phy_mode; - plat_dat->has_gmac4 =1 ; - plat_dat->has_gmac =0 ; - plat_dat->pmt =0 ; + plat_dat->use_phy_wol =1 ; plat_dat->riwt_off =1 ; plat_dat->maxmtu =ETH_DATA_LEN ; + plat_dat->addr64 = priv_plat->variant->dma_bit_mask; plat_dat->bsp_priv = priv_plat; plat_dat->init = mediatek_dwmac_init; plat_dat->exit = mediatek_dwmac_exit; plat_dat->clks_config = mediatek_dwmac_clks_config; +mediatek_dwmac_init (pdev, priv_plat); ret =stmmac_dvr_probe (&pdev->dev, plat_dat, &stmmac_res);
Signature · 1 line
2.25.1
PATCH v12 3/7 stmmac: dwmac-mediatek: re-arrange clock setting
In reply to Biao HuangThe rmii_internal clock is needed only when PHY interface is RMII, and reference clock is from MAC.
Re-arrange the clock setting as following:
1. the optional "rmii_internal" is controlled by devm_clk_get(),
2. other clocks still be configured by devm_clk_bulk_get().
--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 72 +++++++++++++------ 1 file changed, 49 insertions(+), 23 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +49 -23
@@ -49,14 +49,15 @@ struct mac_delay_struct {struct mediatek_dwmac_plat_data {const struct mediatek_dwmac_variant *variant;struct mac_delay_struct mac_delay; +struct clk *rmii_internal_clk;struct clk_bulk_data *clks; -struct device_node *np;struct regmap *peri_regmap; +struct device_node *np;struct device *dev;phy_interface_t phy_mode; -int num_clks_to_config;bool rmii_clk_from_mac;bool rmii_rxc; +int num_clks; };struct mediatek_dwmac_variant {
@@ -74,7 +75,7 @@ struct mediatek_dwmac_variant {/* list of clocks required for mac */ static const char *const mt2712_dwmac_clk_l[] = { -"axi" ,"apb" ,"mac_main" ,"ptp_ref" ,"rmii_internal" +"axi" ,"apb" ,"mac_main" ,"ptp_ref" };static int mt2712_set_interface (struct mediatek_dwmac_plat_data *plat)
@@ -83,23 +84,12 @@ static int mt2712_set_interface(struct mediatek_dwmac_plat_data *plat)int rmii_rxc = plat->rmii_rxc ?RMII_CLK_SRC_RXC :0 ;u32 intf_val =0 ; -/* The clock labeled as "rmii_internal" in mt2712_dwmac_clk_l is needed -* only in RMII(when MAC provides the reference clock), and useless for -* RGMII/MII/RMII(when PHY provides the reference clock). -* num_clks_to_config indicates the real number of clocks should be -* configured, equals to (plat->variant->num_clks - 1) in default for all the case, -* then +1 for rmii_clk_from_mac case. -*/ - plat->num_clks_to_config = plat->variant->num_clks -1 ; -/* select phy interface in top control domain */ switch (plat->phy_mode) {case PHY_INTERFACE_MODE_MII : intf_val |=PHY_INTF_MII ;break ;case PHY_INTERFACE_MODE_RMII : -if (plat->rmii_clk_from_mac) - plat->num_clks_to_config++; intf_val |= (PHY_INTF_RMII | rmii_rxc | rmii_clk_from_mac);break ;case PHY_INTERFACE_MODE_RGMII :
@@ -314,18 +304,36 @@ static int mediatek_dwmac_config_dt(struct mediatek_dwmac_plat_data *plat)static int mediatek_dwmac_clk_init (struct mediatek_dwmac_plat_data *plat) {const struct mediatek_dwmac_variant *variant = plat->variant; -int i, num = variant->num_clks; +int i, ret; + + plat->num_clks = variant->num_clks; - plat->clks =devm_kcalloc (plat->dev, num,sizeof (*plat->clks),GFP_KERNEL ); + plat->clks =devm_kcalloc (plat->dev, plat->num_clks,sizeof (*plat->clks),GFP_KERNEL );if (!plat->clks)return -ENOMEM ; -for (i =0 ; i < num; i++) +for (i =0 ; i < plat->num_clks; i++) plat->clks[i].id = variant->clk_list[i]; - plat->num_clks_to_config = variant->num_clks; + ret =devm_clk_bulk_get (plat->dev, plat->num_clks, plat->clks); +if (ret) +return ret; + +/* The clock labeled as "rmii_internal" is needed only in RMII(when +* MAC provides the reference clock), and useless for RGMII/MII or +* RMII(when PHY provides the reference clock). +* So, "rmii_internal" clock is got and configured only when +* reference clock of RMII is from MAC. +*/ +if (plat->rmii_clk_from_mac) { + plat->rmii_internal_clk =devm_clk_get (plat->dev,"rmii_internal" ); +if (IS_ERR (plat->rmii_internal_clk)) + ret =PTR_ERR (plat->rmii_internal_clk); + }else { + plat->rmii_internal_clk =NULL ; + } -return devm_clk_bulk_get (plat->dev, num, plat->clks); +return ret; }static int mediatek_dwmac_init (struct platform_device *pdev,void *priv)
@@ -350,20 +358,31 @@ static int mediatek_dwmac_init(struct platform_device *pdev, void *priv) } } - ret =clk_bulk_prepare_enable (plat->num_clks_to_config, plat->clks); + ret =clk_bulk_prepare_enable (plat->num_clks, plat->clks);if (ret) {dev_err (plat->dev,"failed to enable clks, err = %d\n" , ret);return ret; } + ret =clk_prepare_enable (plat->rmii_internal_clk); +if (ret) { +dev_err (plat->dev,"failed to enable rmii internal clk, err = %d\n" , ret); + goto err_clk; + } +return 0 ; + +err_clk: +clk_bulk_disable_unprepare (plat->num_clks, plat->clks); +return ret; }static void mediatek_dwmac_exit (struct platform_device *pdev,void *priv) {struct mediatek_dwmac_plat_data *plat = priv; -clk_bulk_disable_unprepare (plat->num_clks_to_config, plat->clks); +clk_disable_unprepare (plat->rmii_internal_clk); +clk_bulk_disable_unprepare (plat->num_clks, plat->clks); }static int mediatek_dwmac_clks_config (void *priv,bool enabled)
@@ -372,13 +391,20 @@ static int mediatek_dwmac_clks_config(void *priv, bool enabled)int ret =0 ;if (enabled) { - ret =clk_bulk_prepare_enable (plat->num_clks_to_config, plat->clks); + ret =clk_bulk_prepare_enable (plat->num_clks, plat->clks);if (ret) {dev_err (plat->dev,"failed to enable clks, err = %d\n" , ret);return ret; } + + ret =clk_prepare_enable (plat->rmii_internal_clk); +if (ret) { +dev_err (plat->dev,"failed to enable rmii internal clk, err = %d\n" , ret); +return ret; + } }else { -clk_bulk_disable_unprepare (plat->num_clks_to_config, plat->clks); +clk_disable_unprepare (plat->rmii_internal_clk); +clk_bulk_disable_unprepare (plat->num_clks, plat->clks); }return ret;
Signature · 1 line
2.25.1
AngeloGioacchino Del Regno
maintainerRe: [PATCH net-next v12 3/7] stmmac: dwmac-mediatek: re-arrange clock setting
Il 17/01/22 08:07, Biao Huang ha scritto:
Quoted 21 lines
The
rmii_internalclock is needed only when PHY interface is RMII, and reference clock is from MAC.Re-arrange the clock setting as following:
1. the optional "rmii_internal" is controlled bydevm_clk_get(),
2. other clocks still be configured bydevm_clk_bulk_get().Signed-off-by Biao Huang <[email protected]>--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 72 +++++++++++++------ 1 file changed, 49 insertions(+), 23 deletions(-)drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0@@ -49,14 +49,15 @@ struct mac_delay_struct {struct mediatek_dwmac_plat_data {const struct mediatek_dwmac_variant *variant;struct mac_delay_struct mac_delay; +struct clk *rmii_internal_clk;
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c struct mac_delay_struct { · line 60
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +2
-2struct clk_bulk_data *clks; -struct device_node *np;struct regmap *peri_regmap; +struct device_node *np;struct device *dev;phy_interface_t phy_mode; -int num_clks_to_config;bool rmii_clk_from_mac;bool rmii_rxc; +int num_clks;
I don't see any need to get a num_clks here, at this point: since all functions reading this are getting passed a pointer to this entire structure, you can simply always access plat->variant->num_clks.
Please, drop the addition of num_clks in this struct.
Regards,
Angelo
Re: [PATCH net-next v12 3/7] stmmac: dwmac-mediatek: re-arrange clock setting
Dear Angelo,
Thanks for your comments.
Quoted 41 lines · AngeloGioacchino Del Regno
Il 17/01/22 08:07, Biao Huang ha scritto:
Quoted 23 lines
The
rmii_internalclock is needed only when PHY interface is RMII, and reference clock is from MAC.Re-arrange the clock setting as following:
1. the optional "rmii_internal" is controlled bydevm_clk_get(),
2. other clocks still be configured bydevm_clk_bulk_get().Signed-off-by Biao Huang <[email protected]>--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 72 +++++++++++++- ----- 1 file changed, 49 insertions(+), 23 deletions(-)drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0@@ -49,14 +49,15 @@ struct mac_delay_struct {struct mediatek_dwmac_plat_data {const struct mediatek_dwmac_variant *variant;struct mac_delay_struct mac_delay; +struct clk *rmii_internal_clk;drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c struct mac_delay_struct { · line 60
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +2
-2struct clk_bulk_data *clks; -struct device_node *np;struct regmap *peri_regmap; +struct device_node *np;struct device *dev;phy_interface_t phy_mode; -int num_clks_to_config;bool rmii_clk_from_mac;bool rmii_rxc; +int num_clks;I don't see any need to get a
num_clkshere, at this point: since all functions
reading this are getting passed a pointer to this entire structure, you can
simply always accessplat->variant->num_clks.
Quoted 4 lines
Please, drop the addition of
num_clksin this struct.Regards,
Angelo
OK, will remove it in next send.
PATCH v12 4/7 arm64: dts: mt2712: update ethernet device node
In reply to Biao HuangSince there are some changes in ethernet driver:
update ethernet device node in dts to accommodate to it.
1. stmmac_probe_config_dt() in stmmac_platform.c will initialize specified parameters according to compatible string "snps,dwmac-4.20a", then, dwmac-mediatek.c can skip the initialization if add compatible string "snps,dwmac-4.20a" in eth device node.
2. commit 882007ed7832 ("net-next: dt-binding: dwmac-mediatek: add more description for RMII") added rmii internal support, we should add corresponding clocks/clocks-names in eth device node.
3. add "snps,reset-delays-us = <0 10000 10000>;" to ensure reset delay can meet PHY requirement.
--- arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 1 + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/mediatek/mt2712-evb.dts +1 -0
@@ -110,6 +110,7 @@ ð { phy-handle = <ðernet_phy0>; mediatek,tx-delay-ps = <1530>; snps,reset-gpio = <&pio 87 GPIO_ACTIVE_LOW>; + snps,reset-delays-us = <0 10000 10000>; pinctrl-names = "default", "sleep"; pinctrl-0 = <ð_default>; pinctrl-1 = <ð_sleep>;
arch/arm64/boot/dts/mediatek/mt2712e.dtsi +9 -5
@@ -726,7 +726,7 @@ queue2 { }; eth: ethernet@1101c000 { - compatible = "mediatek,mt2712-gmac"; + compatible = "mediatek,mt2712-gmac", "snps,dwmac-4.20a"; reg = <0 0x1101c000 0 0x1300>; interrupts = <GIC_SPI 237 IRQ_TYPE_LEVEL_LOW>; interrupt-names = "macirq";
@@ -734,15 +734,19 @@ eth: ethernet@1101c000 { clock-names = "axi", "apb", "mac_main", - "ptp_ref"; + "ptp_ref", + "rmii_internal"; clocks = <&pericfg CLK_PERI_GMAC>, <&pericfg CLK_PERI_GMAC_PCLK>, <&topckgen CLK_TOP_ETHER_125M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_SEL>; + <&topckgen CLK_TOP_ETHER_50M_SEL>, + <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>; assigned-clocks = <&topckgen CLK_TOP_ETHER_125M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_SEL>; + <&topckgen CLK_TOP_ETHER_50M_SEL>, + <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>; assigned-clock-parents = <&topckgen CLK_TOP_ETHERPLL_125M>, - <&topckgen CLK_TOP_APLL1_D3>; + <&topckgen CLK_TOP_APLL1_D3>, + <&topckgen CLK_TOP_ETHERPLL_50M>; power-domains = <&scpsys MT2712_POWER_DOMAIN_AUDIO>; mediatek,pericfg = <&pericfg>; snps,axi-config = <&stmmac_axi_setup>;
Signature · 1 line
2.25.1
Re: [PATCH net-next v12 4/7] arm64: dts: mt2712: update ethernet device node
Dear Matthias,
Any comments about this dts patch?
Thanks in advance.
Regards!
Biao
Quoted 79 lines · Biao Huang
Since there are some changes in ethernet driver:
update ethernet device node in dts to accommodate to it.1.
stmmac_probe_config_dt()instmmac_platform.cwill initialize specified
parameters according to compatible string "snps,dwmac-4.20a",
then,
dwmac-mediatek.ccan skip the initialization if add compatible
string
"snps,dwmac-4.20a" in eth device node.
2. commit882007ed7832("net-next: dt-binding: dwmac-mediatek: add more
description for RMII") added rmii internal support, we should add corresponding clocks/clocks-names in eth device node.
3. add "snps,reset-delays-us = <0 10000 10000>;" to ensure reset delay
can meet PHY requirement.Signed-off-by Biao Huang <[email protected]>--- arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 1 + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-)arch/arm64/boot/dts/mediatek/mt2712-evb.dts +1
-0@@ -110,6 +110,7 @@ ð { phy-handle = <ðernet_phy0>; mediatek,tx-delay-ps = <1530>; snps,reset-gpio = <&pio 87 GPIO_ACTIVE_LOW>; + snps,reset-delays-us = <0 10000 10000>; pinctrl-names = "default", "sleep"; pinctrl-0 = <ð_default>; pinctrl-1 = <ð_sleep>;arch/arm64/boot/dts/mediatek/mt2712e.dtsi +1
-1@@ -726,7 +726,7 @@ queue2 { }; eth: ethernet@1101c000 { - compatible = "mediatek,mt2712-gmac"; + compatible = "mediatek,mt2712-gmac", "snps,dwmac- 4.20a"; reg = <0 0x1101c000 0 0x1300>; interrupts = <GIC_SPI 237 IRQ_TYPE_LEVEL_LOW>;arch/arm64/boot/dts/mediatek/mt2712e.dtsi +8
-4interrupt-names = "macirq";@@ -734,15 +734,19 @@ eth: ethernet@1101c000 { clock-names = "axi", "apb", "mac_main", - "ptp_ref"; + "ptp_ref", + "rmii_internal"; clocks = <&pericfg CLK_PERI_GMAC>, <&pericfg CLK_PERI_GMAC_PCLK>, <&topckgen CLK_TOP_ETHER_125M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_SEL>; + <&topckgen CLK_TOP_ETHER_50M_SEL>, + <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>; assigned-clocks = <&topckgen CLK_TOP_ETHER_125M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_SEL>; + <&topckgen CLK_TOP_ETHER_50M_SEL>, + <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>; assigned-clock-parents = <&topckgen CLK_TOP_ETHERPLL_125M>, - <&topckgen CLK_TOP_APLL1_D3>; + <&topckgen CLK_TOP_APLL1_D3>, + <&topckgen CLK_TOP_ETHERPLL_50M>;arch/arm64/boot/dts/mediatek/mt2712e.dtsi +0
-0power-domains = <&scpsys MT2712_POWER_DOMAIN_AUDIO>; mediatek,pericfg = <&pericfg>; snps,axi-config = <&stmmac_axi_setup>;
PATCH v12 5/7 net: dt-bindings: dwmac: Convert mediatek-dwmac to DT schema
In reply to Biao HuangConvert mediatek-dwmac to DT schema, and delete old mediatek-dwmac.txt. And there are some changes in .yaml than .txt, others almost keep the same:
1. compatible "const: snps,dwmac-4.20".
2. delete "snps,reset-active-low;" in example, since driver remove this property long ago.
3. add "snps,reset-delay-us = <0 10000 10000>" in example.
4. the example is for rgmii interface, keep related properties only.
--- .../bindings/net/mediatek-dwmac.txt | 91 ---------- .../bindings/net/mediatek-dwmac.yaml | 155 ++++++++++++++++++ 2 files changed, 155 insertions(+), 91 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/mediatek-dwmac.txt create mode 100644 Documentation/devicetree/bindings/net/mediatek-dwmac.yaml
Documentation/devicetree/bindings/net/mediatek-dwmac.txt deleted +0 -91
@@ -1,91 +0,0 @@ -MediaTek DWMAC glue layer controller - -This file documents platform glue layer for stmmac. -Please see stmmac.txt for the other unchanged properties. - -The device node has following properties. - -Required properties: -- compatible: Should be "mediatek,mt2712-gmac" for MT2712 SoC -- reg: Address and length of the register set for the device -- interrupts: Should contain the MAC interrupts -- interrupt-names: Should contain a list of interrupt names corresponding to - the interrupts in the interrupts property, if available. - Should be "macirq" for the main MAC IRQ -- clocks: Must contain a phandle for each entry in clock-names. -- clock-names: The name of the clock listed in the clocks property. These are - "axi", "apb", "mac_main", "ptp_ref", "rmii_internal" for MT2712 SoC. -- mac-address: See ethernet.txt in the same directory -- phy-mode: See ethernet.txt in the same directory -- mediatek,pericfg: A phandle to the syscon node that control ethernet - interface and timing delay. - -Optional properties: -- mediatek,tx-delay-ps: TX clock delay macro value. Default is 0. - It should be defined for RGMII/MII interface. - It should be defined for RMII interface when the reference clock is from MT2712 SoC. -- mediatek,rx-delay-ps: RX clock delay macro value. Default is 0. - It should be defined for RGMII/MII interface. - It should be defined for RMII interface. -Both delay properties need to be a multiple of 170 for RGMII interface, -or will round down. Range 0~31*170. -Both delay properties need to be a multiple of 550 for MII/RMII interface, -or will round down. Range 0~31*550. - -- mediatek,rmii-rxc: boolean property, if present indicates that the RMII - reference clock, which is from external PHYs, is connected to RXC pin - on MT2712 SoC. - Otherwise, is connected to TXC pin. -- mediatek,rmii-clk-from-mac: boolean property, if present indicates that - MT2712 SoC provides the RMII reference clock, which outputs to TXC pin only. -- mediatek,txc-inverse: boolean property, if present indicates that - 1. tx clock will be inversed in MII/RGMII case, - 2. tx clock inside MAC will be inversed relative to reference clock - which is from external PHYs in RMII case, and it rarely happen. - 3. the reference clock, which outputs to TXC pin will be inversed in RMII case - when the reference clock is from MT2712 SoC. -- mediatek,rxc-inverse: boolean property, if present indicates that - 1. rx clock will be inversed in MII/RGMII case. - 2. reference clock will be inversed when arrived at MAC in RMII case, when - the reference clock is from external PHYs. - 3. the inside clock, which be sent to MAC, will be inversed in RMII case when - the reference clock is from MT2712 SoC. -- assigned-clocks: mac_main and ptp_ref clocks -- assigned-clock-parents: parent clocks of the assigned clocks - -Example: - eth: ethernet@1101c000 { - compatible = "mediatek,mt2712-gmac"; - reg = <0 0x1101c000 0 0x1300>; - interrupts = <GIC_SPI 237 IRQ_TYPE_LEVEL_LOW>; - interrupt-names = "macirq"; - phy-mode ="rgmii-rxid"; - mac-address = [00 55 7b b5 7d f7]; - clock-names = "axi", - "apb", - "mac_main", - "ptp_ref", - "rmii_internal"; - clocks = <&pericfg CLK_PERI_GMAC>, - <&pericfg CLK_PERI_GMAC_PCLK>, - <&topckgen CLK_TOP_ETHER_125M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>; - assigned-clocks = <&topckgen CLK_TOP_ETHER_125M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>; - assigned-clock-parents = <&topckgen CLK_TOP_ETHERPLL_125M>, - <&topckgen CLK_TOP_APLL1_D3>, - <&topckgen CLK_TOP_ETHERPLL_50M>; - power-domains = <&scpsys MT2712_POWER_DOMAIN_AUDIO>; - mediatek,pericfg = <&pericfg>; - mediatek,tx-delay-ps = <1530>; - mediatek,rx-delay-ps = <1530>; - mediatek,rmii-rxc; - mediatek,txc-inverse; - mediatek,rxc-inverse; - snps,txpbl = <1>; - snps,rxpbl = <1>; - snps,reset-gpio = <&pio 87 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - };
Documentation/devicetree/bindings/net/mediatek-dwmac.yaml new file +155 -0
155 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v12 6/7 stmmac: dwmac-mediatek: add support for mt8195
In reply to Biao HuangAdd Ethernet support for MediaTek SoCs from the mt8195 family.
--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 278 +++++++++++++++++- 1 file changed, 268 insertions(+), 10 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +268 -10
@@ -39,6 +39,33 @@#define ETH_FINE_DLY_GTXC BIT(1)#define ETH_FINE_DLY_RXC BIT(0) +/* Peri Configuration register for mt8195 */ +#define MT8195_PERI_ETH_CTRL0 0xFD0 +#define MT8195_RMII_CLK_SRC_INTERNAL BIT(28) +#define MT8195_RMII_CLK_SRC_RXC BIT(27) +#define MT8195_ETH_INTF_SEL GENMASK(26, 24) +#define MT8195_RGMII_TXC_PHASE_CTRL BIT(22) +#define MT8195_EXT_PHY_MODE BIT(21) +#define MT8195_DLY_GTXC_INV BIT(12) +#define MT8195_DLY_GTXC_ENABLE BIT(5) +#define MT8195_DLY_GTXC_STAGES GENMASK(4, 0) + +#define MT8195_PERI_ETH_CTRL1 0xFD4 +#define MT8195_DLY_RXC_INV BIT(25) +#define MT8195_DLY_RXC_ENABLE BIT(18) +#define MT8195_DLY_RXC_STAGES GENMASK(17, 13) +#define MT8195_DLY_TXC_INV BIT(12) +#define MT8195_DLY_TXC_ENABLE BIT(5) +#define MT8195_DLY_TXC_STAGES GENMASK(4, 0) + +#define MT8195_PERI_ETH_CTRL2 0xFD8 +#define MT8195_DLY_RMII_RXC_INV BIT(25) +#define MT8195_DLY_RMII_RXC_ENABLE BIT(18) +#define MT8195_DLY_RMII_RXC_STAGES GENMASK(17, 13) +#define MT8195_DLY_RMII_TXC_INV BIT(12) +#define MT8195_DLY_RMII_TXC_ENABLE BIT(5) +#define MT8195_DLY_RMII_TXC_STAGES GENMASK(4, 0) +struct mac_delay_struct {u32 tx_delay;u32 rx_delay;
@@ -57,12 +84,14 @@ struct mediatek_dwmac_plat_data {phy_interface_t phy_mode;bool rmii_clk_from_mac;bool rmii_rxc; +bool mac_wol;int num_clks; };struct mediatek_dwmac_variant {int (*dwmac_set_phy_interface)(struct mediatek_dwmac_plat_data *plat);int (*dwmac_set_delay)(struct mediatek_dwmac_plat_data *plat); +void (*dwmac_fix_mac_speed)(void *priv,unsigned int speed);/* clock ids to be requested */ const char *const *clk_list;
@@ -78,6 +107,10 @@ static const char * const mt2712_dwmac_clk_l[] = { "axi", "apb", "mac_main", "ptp_ref" }; +static const char *const mt8195_dwmac_clk_l[] = { +"axi" ,"apb" ,"mac_cg" ,"mac_main" ,"ptp_ref" +}; +static int mt2712_set_interface (struct mediatek_dwmac_plat_data *plat) {int rmii_clk_from_mac = plat->rmii_clk_from_mac ?RMII_CLK_SRC_INTERNAL :0 ;
@@ -257,6 +290,193 @@ static const struct mediatek_dwmac_variant mt2712_gmac_variant = { .tx_delay_max = 17600, }; +static int mt8195_set_interface (struct mediatek_dwmac_plat_data *plat) +{ +int rmii_clk_from_mac = plat->rmii_clk_from_mac ?MT8195_RMII_CLK_SRC_INTERNAL :0 ; +int rmii_rxc = plat->rmii_rxc ?MT8195_RMII_CLK_SRC_RXC :0 ; +u32 intf_val =0 ; + +/* select phy interface in top control domain */ +switch (plat->phy_mode) { +case PHY_INTERFACE_MODE_MII : + intf_val |=FIELD_PREP (MT8195_ETH_INTF_SEL ,PHY_INTF_MII ); +break ; +case PHY_INTERFACE_MODE_RMII : + intf_val |= (rmii_rxc | rmii_clk_from_mac); + intf_val |=FIELD_PREP (MT8195_ETH_INTF_SEL ,PHY_INTF_RMII ); +break ; +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_TXID : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_ID : + intf_val |=FIELD_PREP (MT8195_ETH_INTF_SEL ,PHY_INTF_RGMII ); +break ; +default : +dev_err (plat->dev,"phy interface not supported\n" ); +return -EINVAL ; + } + +/* MT8195 only support external PHY */ + intf_val |=MT8195_EXT_PHY_MODE ; + +regmap_write (plat->peri_regmap,MT8195_PERI_ETH_CTRL0 , intf_val); + +return 0 ; +} + +static void mt8195_delay_ps2stage (struct mediatek_dwmac_plat_data *plat) +{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; + +/* 290ps per stage */ + mac_delay->tx_delay /=290 ; + mac_delay->rx_delay /=290 ; +} + +static void mt8195_delay_stage2ps (struct mediatek_dwmac_plat_data *plat) +{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; + +/* 290ps per stage */ + mac_delay->tx_delay *=290 ; + mac_delay->rx_delay *=290 ; +} + +static int mt8195_set_delay (struct mediatek_dwmac_plat_data *plat) +{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; +u32 gtxc_delay_val =0 , delay_val =0 , rmii_delay_val =0 ; + +mt8195_delay_ps2stage (plat); + +switch (plat->phy_mode) { +case PHY_INTERFACE_MODE_MII : + delay_val |=FIELD_PREP (MT8195_DLY_TXC_ENABLE , !!mac_delay->tx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_STAGES , mac_delay->tx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_INV , mac_delay->tx_inv); + + delay_val |=FIELD_PREP (MT8195_DLY_RXC_ENABLE , !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_STAGES , mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_INV , mac_delay->rx_inv); +break ; +case PHY_INTERFACE_MODE_RMII : +if (plat->rmii_clk_from_mac) { +/* case 1: mac provides the rmii reference clock, +* and the clock output to TXC pin. +* The egress timing can be adjusted by RMII_TXC delay macro circuit. +* The ingress timing can be adjusted by RMII_RXC delay macro circuit. +*/ + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_TXC_ENABLE , + !!mac_delay->tx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_TXC_STAGES , + mac_delay->tx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_TXC_INV , + mac_delay->tx_inv); + + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_RXC_ENABLE , + !!mac_delay->rx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_RXC_STAGES , + mac_delay->rx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_RXC_INV , + mac_delay->rx_inv); + }else { +/* case 2: the rmii reference clock is from external phy, +* and the property "rmii_rxc" indicates which pin(TXC/RXC) +* the reference clk is connected to. The reference clock is a +* received signal, so rx_delay/rx_inv are used to indicate +* the reference clock timing adjustment +*/ +if (plat->rmii_rxc) { +/* the rmii reference clock from outside is connected +* to RXC pin, the reference clock will be adjusted +* by RXC delay macro circuit. +*/ + delay_val |=FIELD_PREP (MT8195_DLY_RXC_ENABLE , + !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_STAGES , + mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_INV , + mac_delay->rx_inv); + }else { +/* the rmii reference clock from outside is connected +* to TXC pin, the reference clock will be adjusted +* by TXC delay macro circuit. +*/ + delay_val |=FIELD_PREP (MT8195_DLY_TXC_ENABLE , + !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_STAGES , + mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_INV , + mac_delay->rx_inv); + } + } +break ; +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_TXID : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_ID : + gtxc_delay_val |=FIELD_PREP (MT8195_DLY_GTXC_ENABLE , !!mac_delay->tx_delay); + gtxc_delay_val |=FIELD_PREP (MT8195_DLY_GTXC_STAGES , mac_delay->tx_delay); + gtxc_delay_val |=FIELD_PREP (MT8195_DLY_GTXC_INV , mac_delay->tx_inv); + + delay_val |=FIELD_PREP (MT8195_DLY_RXC_ENABLE , !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_STAGES , mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_INV , mac_delay->rx_inv); + +break ; +default : +dev_err (plat->dev,"phy interface not supported\n" ); +return -EINVAL ; + } + +regmap_update_bits (plat->peri_regmap, +MT8195_PERI_ETH_CTRL0 , +MT8195_RGMII_TXC_PHASE_CTRL | +MT8195_DLY_GTXC_INV | +MT8195_DLY_GTXC_ENABLE | +MT8195_DLY_GTXC_STAGES , + gtxc_delay_val); +regmap_write (plat->peri_regmap,MT8195_PERI_ETH_CTRL1 , delay_val); +regmap_write (plat->peri_regmap,MT8195_PERI_ETH_CTRL2 , rmii_delay_val); + +mt8195_delay_stage2ps (plat); + +return 0 ; +} + +static void mt8195_fix_mac_speed (void *priv,unsigned int speed) +{ +struct mediatek_dwmac_plat_data *priv_plat = priv; + +if ((phy_interface_mode_is_rgmii (priv_plat->phy_mode))) { +/* prefer 2ns fixed delay which is controlled by TXC_PHASE_CTRL, +* when link speed is 1Gbps with RGMII interface, +* Fall back to delay macro circuit for 10/100Mbps link speed. +*/ +if (speed ==SPEED_1000 ) +regmap_update_bits (priv_plat->peri_regmap, +MT8195_PERI_ETH_CTRL0 , +MT8195_RGMII_TXC_PHASE_CTRL | +MT8195_DLY_GTXC_ENABLE | +MT8195_DLY_GTXC_INV | +MT8195_DLY_GTXC_STAGES , +MT8195_RGMII_TXC_PHASE_CTRL ); +else +mt8195_set_delay (priv_plat); + } +} + +static const struct mediatek_dwmac_variant mt8195_gmac_variant = { + .dwmac_set_phy_interface = mt8195_set_interface, + .dwmac_set_delay = mt8195_set_delay, + .dwmac_fix_mac_speed = mt8195_fix_mac_speed, + .clk_list = mt8195_dwmac_clk_l, + .num_clks =ARRAY_SIZE (mt8195_dwmac_clk_l), + .dma_bit_mask =35 , + .rx_delay_max =9280 , + .tx_delay_max =9280 , +}; +static int mediatek_dwmac_config_dt (struct mediatek_dwmac_plat_data *plat) {struct mac_delay_struct *mac_delay = &plat->mac_delay;
@@ -297,6 +517,7 @@ static int mediatek_dwmac_config_dt(struct mediatek_dwmac_plat_data *plat) mac_delay->rx_inv =of_property_read_bool (plat->np,"mediatek,rxc-inverse" ); plat->rmii_rxc =of_property_read_bool (plat->np,"mediatek,rmii-rxc" ); plat->rmii_clk_from_mac =of_property_read_bool (plat->np,"mediatek,rmii-clk-from-mac" ); + plat->mac_wol =of_property_read_bool (plat->np,"mediatek,mac-wol" );return 0 ; }
@@ -409,6 +630,50 @@ static int mediatek_dwmac_clks_config(void *priv, bool enabled)return ret; } + +static int mediatek_dwmac_common_data (struct platform_device *pdev, +struct plat_stmmacenet_data *plat, +struct mediatek_dwmac_plat_data *priv_plat) +{ +int i; + + plat->interface = priv_plat->phy_mode; + plat->use_phy_wol = priv_plat->mac_wol ?0 :1 ; + plat->riwt_off =1 ; + plat->maxmtu =ETH_DATA_LEN ; + plat->addr64 = priv_plat->variant->dma_bit_mask; + plat->bsp_priv = priv_plat; + plat->init = mediatek_dwmac_init; + plat->exit = mediatek_dwmac_exit; + plat->clks_config = mediatek_dwmac_clks_config; +if (priv_plat->variant->dwmac_fix_mac_speed) + plat->fix_mac_speed = priv_plat->variant->dwmac_fix_mac_speed; + + plat->safety_feat_cfg =devm_kzalloc (&pdev->dev, +sizeof (*plat->safety_feat_cfg), +GFP_KERNEL ); +if (!plat->safety_feat_cfg) +return -ENOMEM ; + + plat->safety_feat_cfg->tsoee =1 ; + plat->safety_feat_cfg->mrxpee =0 ; + plat->safety_feat_cfg->mestee =1 ; + plat->safety_feat_cfg->mrxee =1 ; + plat->safety_feat_cfg->mtxee =1 ; + plat->safety_feat_cfg->epsi =0 ; + plat->safety_feat_cfg->edpp =1 ; + plat->safety_feat_cfg->prtyen =1 ; + plat->safety_feat_cfg->tmouten =1 ; + +for (i =0 ; i < plat->tx_queues_to_use; i++) { +/* Default TX Q0 to use TSO and rest TXQ for TBS */ +if (i >0 ) + plat->tx_queues_cfg[i].tbs_en =1 ; + } + +return 0 ; +} +static int mediatek_dwmac_probe (struct platform_device *pdev) {struct mediatek_dwmac_plat_data *priv_plat;
@@ -445,16 +710,7 @@ static int mediatek_dwmac_probe(struct platform_device *pdev)if (IS_ERR (plat_dat))return PTR_ERR (plat_dat); - plat_dat->interface = priv_plat->phy_mode; - plat_dat->use_phy_wol =1 ; - plat_dat->riwt_off =1 ; - plat_dat->maxmtu =ETH_DATA_LEN ; - plat_dat->addr64 = priv_plat->variant->dma_bit_mask; - plat_dat->bsp_priv = priv_plat; - plat_dat->init = mediatek_dwmac_init; - plat_dat->exit = mediatek_dwmac_exit; - plat_dat->clks_config = mediatek_dwmac_clks_config; - +mediatek_dwmac_common_data (pdev, plat_dat, priv_plat);mediatek_dwmac_init (pdev, priv_plat); ret =stmmac_dvr_probe (&pdev->dev, plat_dat, &stmmac_res);
@@ -469,6 +725,8 @@ static int mediatek_dwmac_probe(struct platform_device *pdev)static const struct of_device_id mediatek_dwmac_match[] = { { .compatible ="mediatek,mt2712-gmac" , .data = &mt2712_gmac_variant }, + { .compatible ="mediatek,mt8195-gmac" , + .data = &mt8195_gmac_variant }, { } };
Signature · 1 line
2.25.1
PATCH v12 7/7 net: dt-bindings: dwmac: add support for mt8195
In reply to Biao HuangAdd binding document for the ethernet on mt8195.
--- .../bindings/net/mediatek-dwmac.yaml | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/net/mediatek-dwmac.yaml +24 -4
@@ -19,6 +19,7 @@ select: contains: enum: - mediatek,mt2712-gmac + - mediatek,mt8195-gmac required: - compatible
@@ -27,26 +28,35 @@ allOf: properties: compatible: - items: - - enum: - - mediatek,mt2712-gmac - - const: snps,dwmac-4.20a + oneOf: + - items: + - enum: + - mediatek,mt2712-gmac + - const: snps,dwmac-4.20a + - items: + - enum: + - mediatek,mt8195-gmac + - const: snps,dwmac-5.10a clocks: + minItems: 5 items: - description: AXI clock - description: APB clock - description: MAC Main clock - description: PTP clock - description: RMII reference clock provided by MAC + - description: MAC clock gate clock-names: + minItems: 5 items: - const: axi - const: apb - const: mac_main - const: ptp_ref - const: rmii_internal + - const: mac_cg mediatek,pericfg: $ref: /schemas/types.yaml#/definitions/phandle
@@ -61,6 +71,8 @@ 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, + or will round down. Range 0~31*290. mediatek,rx-delay-ps: description:
@@ -69,6 +81,8 @@ 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, or will round down. Range 0~31*290. mediatek,rmii-rxc: type: boolean
@@ -102,6 +116,12 @@ properties: 3. the inside clock, which be sent to MAC, will be inversed in RMII case when the reference clock is from MAC. + mediatek,mac-wol: + type: boolean + description: + If present, indicates that MAC supports WOL(Wake-On-LAN), and MAC WOL will be enabled. + Otherwise, PHY WOL is perferred. + required: - compatible - reg
Signature · 1 line
2.25.1
Rob Herring
maintainerRe: [PATCH net-next v12 7/7] net: dt-bindings: dwmac: add support for mt8195
Quoted 7 lines · Biao Huang
Add binding document for the ethernet on mt8195.
Signed-off-by Biao Huang <[email protected]>--- .../bindings/net/mediatek-dwmac.yaml | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-)
Running 'make dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings.
Note that it is not yet a requirement to have 0 warnings for dtbs_check. This will change in the future.
Full log is available here: https://patchwork.ozlabs.org/patch/1580608
ethernet@1101c000: clock-names: ['axi', 'apb', 'mac_main', 'ptp_ref'] is too short
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yaml
ethernet@1101c000: clocks: [[27, 34], [27, 37], [6, 154], [6, 155]] is too short
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yaml
ethernet@1101c000: compatible: ['mediatek,mt2712-gmac'] does not contain items matching the given schema
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yaml
ethernet@1101c000: compatible: 'oneOf' conditional failed, one must be fixed:
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yaml
ethernet@1101c000: Unevaluated properties are not allowed ('compatible', 'reg', 'interrupts', 'interrupt-names', 'mac-address', 'clock-names', 'clocks', 'power-domains', 'snps,axi-config', 'snps,mtl-rx-config', 'snps,mtl-tx-config', 'snps,txpbl', 'snps,rxpbl', 'clk_csr', 'phy-mode', 'phy-handle', 'snps,reset-gpio', 'mdio' were unexpected)
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yaml
Re: [PATCH net-next v12 7/7] net: dt-bindings: dwmac: add support for mt8195
Dear Rob,
Thanks for your comments. If patch "[PATCH net-next v12 4/7] arm64: dts: mt2712: update
ethernet device node" is applied with dt-binding patches, "make dtbs_check" will not report
such warnings.
Please review it kindly, thanks.
Quoted 46 lines · Rob Herring
Quoted 8 lines · Biao Huang
Add binding document for the ethernet on mt8195.
Signed-off-by Biao Huang <[email protected]>--- .../bindings/net/mediatek-dwmac.yaml | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-)Running 'make
dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings.Note that it is not yet a requirement to have 0 warnings for
dtbs_check.
This will change in the future.Full log is available here:
https://patchwork.ozlabs.org/patch/1580608ethernet@1101c000: clock-names: ['axi', 'apb', '
mac_main', 'ptp_ref'] is too shortarch/arm64/boot/dts/mediatek/mt2712-evb.dt.yamlethernet@1101c000: clocks: [[27, 34], [27, 37], [6, 154], [6, 155]] is too short
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yamlethernet@1101c000: compatible: ['mediatek,mt2712-gmac'] does not contain items matching the given schema
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yamlethernet@1101c000: compatible: 'oneOf' conditional failed, one must be fixed:
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yamlethernet@1101c000: Unevaluated properties are not allowed ('compatible', 'reg', 'interrupts', 'interrupt-names', 'mac-address', 'clock-names', 'clocks', 'power-domains', 'snps,axi-config', 'snps,mtl-rx-config', 'snps,mtl-tx-config', 'snps,txpbl', 'snps,rxpbl', '
clk_csr', 'phy-mode', 'phy-handle', 'snps,reset-gpio', 'mdio' were unexpected)arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yaml
Re: [PATCH net-next v12 7/7] net: dt-bindings: dwmac: add support for mt8195
In reply to Biao HuangQuoted 7 lines · Biao Huang
Add binding document for the ethernet on mt8195.
Signed-off-by Biao Huang <[email protected]>--- .../bindings/net/mediatek-dwmac.yaml | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-)
Re: [PATCH net-next v12 7/7] net: dt-bindings: dwmac: add support for mt8195
Dear Rob,
Thanks for your comments~
Quoted 11 lines · Rob Herring
Quoted 8 lines · Biao Huang
Add binding document for the ethernet on mt8195.
Signed-off-by Biao Huang <[email protected]>--- .../bindings/net/mediatek-dwmac.yaml | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-)Reviewed-by Rob Herring <[email protected]>
I'll add reviewed-by info in next send.
Regards~