arm64: dts: mt8195: Add Ethernet controller
Subsystems (6)
v8 cover arm64: dts: mt8195: Add Ethernet controller
Changes in v8:
1. add reviewed-by as Andrew's comments.
Changes in v7:
1. move mdio node to .dtsi, and remove the compatible property in ethernet-phy node as Andrew's comments.
2. add netdev@ to cc list as Jakub's reminder.
Changes in v6:
1. add reviewed-by as Angelo's comments
2. remove fix_mac_speed in driver as Andrew's comments.
Changes in v5:
1. reorder the clocks as Angelo's comments
2. add a driver patch to fix rgmii-id issue, then we can use a ususal way rgmii/rgmii-id as Andrew's comments.
Changes in v4:
1. remove {address,size}-cells = <0> to avoid warning as Angelo's feedback.
2. Add reviewd-by as Angelo's comments.
Changes in v3:
1. move stmmac-axi-config, rx-queues-config, tx-queues-configs inside ethernet node as Angelo's comments.
2. add {address,size}-cells = <0> in ethernet node as Angelo's comments.
Changes in v2:
1. modify pinctrl node used by ethernet to match rules in pinctrl-mt8195.yaml, which is pointed by Krzysztof.
2. remove "mac-address" property in ethernet node as comments of Krzysztof.
Changes in v1:
add dts node for MT8195 Ethernet controller
Biao Huang (2):
stmmac: dwmac-mediatek: remove the dwmac_fix_mac_speed
arm64: dts: mt8195: Add Ethernet controller
arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 77 ++++++++++++++++ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 92 +++++++++++++++++++ .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 26 ------ 3 files changed, 169 insertions(+), 26 deletions(-)
Signature · 1 line
2.25.1
PATCH v8 1/2 stmmac: dwmac-mediatek: remove the dwmac_fix_mac_speed
In current driver, MAC will always enable 2ns delay in RGMII mode, but that's not the correct usage.
Remove the dwmac_fix_mac_speed() in driver, and recommend "rgmii-id" for phy-mode in device tree.
--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 26 ------------------- 1 file changed, 26 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +0 -26
@@ -90,7 +90,6 @@ struct mediatek_dwmac_plat_data {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;
@@ -443,32 +442,9 @@ static int mt8195_set_delay(struct mediatek_dwmac_plat_data *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 ,
@@ -619,8 +595,6 @@ static int mediatek_dwmac_common_data(struct platform_device *pdev, plat->bsp_priv = priv_plat; plat->init = mediatek_dwmac_init; 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),
Signature · 1 line
2.25.1
PATCH v8 2/2 arm64: dts: mt8195: Add Ethernet controller
In reply to Biao HuangAdd Ethernet controller node for mt8195.
--- arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 77 ++++++++++++++++ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 92 ++++++++++++++++++++ 2 files changed, 169 insertions(+)
arch/arm64/boot/dts/mediatek/mt8195-demo.dts +77 -0
@@ -78,6 +78,23 @@ optee_reserved: optee@43200000 { }; }; +ð { + phy-mode ="rgmii-id"; + phy-handle = <ðernet_phy0>; + snps,reset-gpio = <&pio 93 GPIO_ACTIVE_HIGH>; + snps,reset-delays-us = <0 10000 80000>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <ð_default_pins>; + pinctrl-1 = <ð_sleep_pins>; + status = "okay"; + + mdio { + ethernet_phy0: ethernet-phy@1 { + reg = <0x1>; + }; + }; +}; + &i2c6 { clock-frequency = <400000>; pinctrl-0 = <&i2c6_pins>;
@@ -258,6 +275,66 @@ &mt6359_vsram_others_ldo_reg { }; &pio { + eth_default_pins: eth-default-pins { + pins-txd { + pinmux = <PINMUX_GPIO77__FUNC_GBE_TXD3>, + <PINMUX_GPIO78__FUNC_GBE_TXD2>, + <PINMUX_GPIO79__FUNC_GBE_TXD1>, + <PINMUX_GPIO80__FUNC_GBE_TXD0>; + drive-strength = <MTK_DRIVE_8mA>; + }; + pins-cc { + pinmux = <PINMUX_GPIO85__FUNC_GBE_TXC>, + <PINMUX_GPIO88__FUNC_GBE_TXEN>, + <PINMUX_GPIO87__FUNC_GBE_RXDV>, + <PINMUX_GPIO86__FUNC_GBE_RXC>; + drive-strength = <MTK_DRIVE_8mA>; + }; + pins-rxd { + pinmux = <PINMUX_GPIO81__FUNC_GBE_RXD3>, + <PINMUX_GPIO82__FUNC_GBE_RXD2>, + <PINMUX_GPIO83__FUNC_GBE_RXD1>, + <PINMUX_GPIO84__FUNC_GBE_RXD0>; + }; + pins-mdio { + pinmux = <PINMUX_GPIO89__FUNC_GBE_MDC>, + <PINMUX_GPIO90__FUNC_GBE_MDIO>; + input-enable; + }; + pins-power { + pinmux = <PINMUX_GPIO91__FUNC_GPIO91>, + <PINMUX_GPIO92__FUNC_GPIO92>; + output-high; + }; + }; + + eth_sleep_pins: eth-sleep-pins { + pins-txd { + pinmux = <PINMUX_GPIO77__FUNC_GPIO77>, + <PINMUX_GPIO78__FUNC_GPIO78>, + <PINMUX_GPIO79__FUNC_GPIO79>, + <PINMUX_GPIO80__FUNC_GPIO80>; + }; + pins-cc { + pinmux = <PINMUX_GPIO85__FUNC_GPIO85>, + <PINMUX_GPIO88__FUNC_GPIO88>, + <PINMUX_GPIO87__FUNC_GPIO87>, + <PINMUX_GPIO86__FUNC_GPIO86>; + }; + pins-rxd { + pinmux = <PINMUX_GPIO81__FUNC_GPIO81>, + <PINMUX_GPIO82__FUNC_GPIO82>, + <PINMUX_GPIO83__FUNC_GPIO83>, + <PINMUX_GPIO84__FUNC_GPIO84>; + }; + pins-mdio { + pinmux = <PINMUX_GPIO89__FUNC_GPIO89>, + <PINMUX_GPIO90__FUNC_GPIO90>; + input-disable; + bias-disable; + }; + }; + gpio_keys_pins: gpio-keys-pins { pins { pinmux = <PINMUX_GPIO106__FUNC_GPIO106>;
arch/arm64/boot/dts/mediatek/mt8195.dtsi +92 -0
98 lines not on this page · raw message
Signature · 1 line
2.25.1
Quoted 5 lines · Biao Huang
Add Ethernet controller node for mt8195.
Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Andrew Lunn <[email protected]>Signed-off-by Biao Huang <[email protected]>
Applied, thanks!
Quoted 203 lines
--- arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 77 ++++++++++++++++ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 92 ++++++++++++++++++++ 2 files changed, 169 insertions(+)arch/arm64/boot/dts/mediatek/mt8195-demo.dts +77
-0@@ -78,6 +78,23 @@ optee_reserved: optee@43200000 { }; }; +ð { + phy-mode ="rgmii-id"; + phy-handle = <ðernet_phy0>; + snps,reset-gpio = <&pio 93 GPIO_ACTIVE_HIGH>; + snps,reset-delays-us = <0 10000 80000>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <ð_default_pins>; + pinctrl-1 = <ð_sleep_pins>; + status = "okay"; + + mdio { + ethernet_phy0: ethernet-phy@1 { + reg = <0x1>; + }; + }; +}; + &i2c6 { clock-frequency = <400000>; pinctrl-0 = <&i2c6_pins>;@@ -258,6 +275,66 @@ &mt6359_vsram_others_ldo_reg { }; &pio { + eth_default_pins: eth-default-pins { + pins-txd { + pinmux = <PINMUX_GPIO77__FUNC_GBE_TXD3>, + <PINMUX_GPIO78__FUNC_GBE_TXD2>, + <PINMUX_GPIO79__FUNC_GBE_TXD1>, + <PINMUX_GPIO80__FUNC_GBE_TXD0>; + drive-strength = <MTK_DRIVE_8mA>; + }; + pins-cc { + pinmux = <PINMUX_GPIO85__FUNC_GBE_TXC>, + <PINMUX_GPIO88__FUNC_GBE_TXEN>, + <PINMUX_GPIO87__FUNC_GBE_RXDV>, + <PINMUX_GPIO86__FUNC_GBE_RXC>; + drive-strength = <MTK_DRIVE_8mA>; + }; + pins-rxd { + pinmux = <PINMUX_GPIO81__FUNC_GBE_RXD3>, + <PINMUX_GPIO82__FUNC_GBE_RXD2>, + <PINMUX_GPIO83__FUNC_GBE_RXD1>, + <PINMUX_GPIO84__FUNC_GBE_RXD0>; + }; + pins-mdio { + pinmux = <PINMUX_GPIO89__FUNC_GBE_MDC>, + <PINMUX_GPIO90__FUNC_GBE_MDIO>; + input-enable; + }; + pins-power { + pinmux = <PINMUX_GPIO91__FUNC_GPIO91>, + <PINMUX_GPIO92__FUNC_GPIO92>; + output-high; + }; + }; + + eth_sleep_pins: eth-sleep-pins { + pins-txd { + pinmux = <PINMUX_GPIO77__FUNC_GPIO77>, + <PINMUX_GPIO78__FUNC_GPIO78>, + <PINMUX_GPIO79__FUNC_GPIO79>, + <PINMUX_GPIO80__FUNC_GPIO80>; + }; + pins-cc { + pinmux = <PINMUX_GPIO85__FUNC_GPIO85>, + <PINMUX_GPIO88__FUNC_GPIO88>, + <PINMUX_GPIO87__FUNC_GPIO87>, + <PINMUX_GPIO86__FUNC_GPIO86>; + }; + pins-rxd { + pinmux = <PINMUX_GPIO81__FUNC_GPIO81>, + <PINMUX_GPIO82__FUNC_GPIO82>, + <PINMUX_GPIO83__FUNC_GPIO83>, + <PINMUX_GPIO84__FUNC_GPIO84>; + }; + pins-mdio { + pinmux = <PINMUX_GPIO89__FUNC_GPIO89>, + <PINMUX_GPIO90__FUNC_GPIO90>; + input-disable; + bias-disable; + }; + }; + gpio_keys_pins: gpio-keys-pins { pins { pinmux = <PINMUX_GPIO106__FUNC_GPIO106>;arch/arm64/boot/dts/mediatek/mt8195.dtsi +92
-0@@ -1046,6 +1046,98 @@ spis1: spi@1101e000 { status = "disabled"; }; + eth: ethernet@11021000 { + compatible = "mediatek,mt8195-gmac", "snps,dwmac-5.10a"; + reg = <0 0x11021000 0 0x4000>; + interrupts = <GIC_SPI 716 IRQ_TYPE_LEVEL_HIGH 0>; + interrupt-names = "macirq"; + clock-names = "axi", + "apb", + "mac_main", + "ptp_ref", + "rmii_internal", + "mac_cg"; + clocks = <&pericfg_ao CLK_PERI_AO_ETHERNET>, + <&pericfg_ao CLK_PERI_AO_ETHERNET_BUS>, + <&topckgen CLK_TOP_SNPS_ETH_250M>, + <&topckgen CLK_TOP_SNPS_ETH_62P4M_PTP>, + <&topckgen CLK_TOP_SNPS_ETH_50M_RMII>, + <&pericfg_ao CLK_PERI_AO_ETHERNET_MAC>; + assigned-clocks = <&topckgen CLK_TOP_SNPS_ETH_250M>, + <&topckgen CLK_TOP_SNPS_ETH_62P4M_PTP>, + <&topckgen CLK_TOP_SNPS_ETH_50M_RMII>; + assigned-clock-parents = <&topckgen CLK_TOP_ETHPLL_D2>, + <&topckgen CLK_TOP_ETHPLL_D8>, + <&topckgen CLK_TOP_ETHPLL_D10>; + power-domains = <&spm MT8195_POWER_DOMAIN_ETHER>; + mediatek,pericfg = <&infracfg_ao>; + snps,axi-config = <&stmmac_axi_setup>; + snps,mtl-rx-config = <&mtl_rx_setup>; + snps,mtl-tx-config = <&mtl_tx_setup>; + snps,txpbl = <16>; + snps,rxpbl = <16>; + snps,clk-csr = <0>; + status = "disabled"; + + mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + }; + + stmmac_axi_setup: stmmac-axi-config { + snps,wr_osr_lmt = <0x7>; + snps,rd_osr_lmt = <0x7>; + snps,blen = <0 0 0 0 16 8 4>; + }; + + mtl_rx_setup: rx-queues-config { + snps,rx-queues-to-use = <4>; + snps,rx-sched-sp; + queue0 { + snps,dcb-algorithm; + snps,map-to-dma-channel = <0x0>; + }; + queue1 { + snps,dcb-algorithm; + snps,map-to-dma-channel = <0x0>; + }; + queue2 { + snps,dcb-algorithm; + snps,map-to-dma-channel = <0x0>; + }; + queue3 { + snps,dcb-algorithm; + snps,map-to-dma-channel = <0x0>; + }; + }; + + mtl_tx_setup: tx-queues-config { + snps,tx-queues-to-use = <4>; + snps,tx-sched-wrr; + queue0 { + snps,weight = <0x10>; + snps,dcb-algorithm; + snps,priority = <0x0>; + }; + queue1 { + snps,weight = <0x11>; + snps,dcb-algorithm; + snps,priority = <0x1>; + }; + queue2 { + snps,weight = <0x12>; + snps,dcb-algorithm; + snps,priority = <0x2>; + }; + queue3 { + snps,weight = <0x13>; + snps,dcb-algorithm; + snps,priority = <0x3>; + }; + }; + }; + xhci0: usb@11200000 { compatible = "mediatek,mt8195-xhci", "mediatek,mtk-xhci";
Jakub Kicinski
maintainerQuoted 2 lines · On Thu, 5 Jan 2023 09:07:10 +0800 Biao Huang wrote:
Changes in v8:
1. add reviewed-by as Andrew's comments.
You don't have to repost just to include review/ack tags. They are automatically gathered by our patch application tooling when we apply patches to the tree.
I will take patch 1 to the networking tree, I _think_ patch 2 is supposed to go via Matthias?
Quoted 7 lines · Jakub Kicinski
Quoted 2 lines · On Thu, 5 Jan 2023 09:07:10 +0800 Biao Huang wrote:
Changes in v8:
1. add reviewed-by as Andrew's comments.You don't have to repost just to include review/ack tags. They are automatically gathered by our patch application tooling when we apply patches to the tree.
OK, thanks for your kindly reminder~
Quoted 3 lines
I will take patch 1 to the networking tree, I _think_ patch 2 is supposed to go via Matthias?
OK, @Matthias, please kindly review patch 2 (dts patch).
Best Regards!
Biao
This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 5 Jan 2023 09:07:10 +0800 you wrote:
Changes in v8:
1. add reviewed-by as Andrew's comments.Changes in v7:
1. move mdio node to .dtsi, and remove the compatible property in ethernet-phy node as Andrew's comments.
2. add netdev@ to cc list as Jakub's reminder.[...]
Here is the summary with links:
- [v8,1/2] stmmac: dwmac-mediatek: remove the dwmac_fix_mac_speed
https://git.kernel.org/netdev/net/c/c26de7507d1f
- [v8,2/2] arm64: dts: mt8195: Add Ethernet controller (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html