Commit dfda1fd1 authored by Dong Aisheng's avatar Dong Aisheng Committed by Shawn Guo

arm64: dts: imx8: conn: fix enet clock setting

enet_clk_ref actually is sourced from internal gpr clocks
which needs a default rate. Also update enet lpcg clock
output names to be more straightforward.

Cc: Abel Vesa <abel.vesa@nxp.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarDong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 15a5261e
...@@ -77,9 +77,12 @@ fec1: ethernet@5b040000 { ...@@ -77,9 +77,12 @@ fec1: ethernet@5b040000 {
<GIC_SPI 259 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 259 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&enet0_lpcg IMX_LPCG_CLK_4>, clocks = <&enet0_lpcg IMX_LPCG_CLK_4>,
<&enet0_lpcg IMX_LPCG_CLK_2>, <&enet0_lpcg IMX_LPCG_CLK_2>,
<&enet0_lpcg IMX_LPCG_CLK_1>, <&enet0_lpcg IMX_LPCG_CLK_3>,
<&enet0_lpcg IMX_LPCG_CLK_0>; <&enet0_lpcg IMX_LPCG_CLK_0>;
clock-names = "ipg", "ahb", "enet_clk_ref", "ptp"; clock-names = "ipg", "ahb", "enet_clk_ref", "ptp";
assigned-clocks = <&clk IMX_SC_R_ENET_0 IMX_SC_PM_CLK_PER>,
<&clk IMX_SC_R_ENET_0 IMX_SC_C_CLKDIV>;
assigned-clock-rates = <250000000>, <125000000>;
fsl,num-tx-queues=<3>; fsl,num-tx-queues=<3>;
fsl,num-rx-queues=<3>; fsl,num-rx-queues=<3>;
power-domains = <&pd IMX_SC_R_ENET_0>; power-domains = <&pd IMX_SC_R_ENET_0>;
...@@ -94,9 +97,12 @@ fec2: ethernet@5b050000 { ...@@ -94,9 +97,12 @@ fec2: ethernet@5b050000 {
<GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&enet1_lpcg IMX_LPCG_CLK_4>, clocks = <&enet1_lpcg IMX_LPCG_CLK_4>,
<&enet1_lpcg IMX_LPCG_CLK_2>, <&enet1_lpcg IMX_LPCG_CLK_2>,
<&enet1_lpcg IMX_LPCG_CLK_1>, <&enet1_lpcg IMX_LPCG_CLK_3>,
<&enet1_lpcg IMX_LPCG_CLK_0>; <&enet1_lpcg IMX_LPCG_CLK_0>;
clock-names = "ipg", "ahb", "enet_clk_ref", "ptp"; clock-names = "ipg", "ahb", "enet_clk_ref", "ptp";
assigned-clocks = <&clk IMX_SC_R_ENET_1 IMX_SC_PM_CLK_PER>,
<&clk IMX_SC_R_ENET_1 IMX_SC_C_CLKDIV>;
assigned-clock-rates = <250000000>, <125000000>;
fsl,num-tx-queues=<3>; fsl,num-tx-queues=<3>;
fsl,num-rx-queues=<3>; fsl,num-rx-queues=<3>;
power-domains = <&pd IMX_SC_R_ENET_1>; power-domains = <&pd IMX_SC_R_ENET_1>;
...@@ -152,15 +158,19 @@ enet0_lpcg: clock-controller@5b230000 { ...@@ -152,15 +158,19 @@ enet0_lpcg: clock-controller@5b230000 {
#clock-cells = <1>; #clock-cells = <1>;
clocks = <&clk IMX_SC_R_ENET_0 IMX_SC_PM_CLK_PER>, clocks = <&clk IMX_SC_R_ENET_0 IMX_SC_PM_CLK_PER>,
<&clk IMX_SC_R_ENET_0 IMX_SC_PM_CLK_PER>, <&clk IMX_SC_R_ENET_0 IMX_SC_PM_CLK_PER>,
<&conn_axi_clk>, <&conn_ipg_clk>, <&conn_ipg_clk>; <&conn_axi_clk>,
<&clk IMX_SC_R_ENET_0 IMX_SC_C_TXCLK>,
<&conn_ipg_clk>,
<&conn_ipg_clk>;
clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_1>, clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_1>,
<IMX_LPCG_CLK_2>, <IMX_LPCG_CLK_4>, <IMX_LPCG_CLK_2>, <IMX_LPCG_CLK_3>,
<IMX_LPCG_CLK_5>; <IMX_LPCG_CLK_4>, <IMX_LPCG_CLK_5>;
clock-output-names = "enet0_ipg_root_clk", clock-output-names = "enet0_lpcg_timer_clk",
"enet0_tx_clk", "enet0_lpcg_txc_sampling_clk",
"enet0_ahb_clk", "enet0_lpcg_ahb_clk",
"enet0_ipg_clk", "enet0_lpcg_rgmii_txc_clk",
"enet0_ipg_s_clk"; "enet0_lpcg_ipg_clk",
"enet0_lpcg_ipg_s_clk";
power-domains = <&pd IMX_SC_R_ENET_0>; power-domains = <&pd IMX_SC_R_ENET_0>;
}; };
...@@ -170,15 +180,19 @@ enet1_lpcg: clock-controller@5b240000 { ...@@ -170,15 +180,19 @@ enet1_lpcg: clock-controller@5b240000 {
#clock-cells = <1>; #clock-cells = <1>;
clocks = <&clk IMX_SC_R_ENET_1 IMX_SC_PM_CLK_PER>, clocks = <&clk IMX_SC_R_ENET_1 IMX_SC_PM_CLK_PER>,
<&clk IMX_SC_R_ENET_1 IMX_SC_PM_CLK_PER>, <&clk IMX_SC_R_ENET_1 IMX_SC_PM_CLK_PER>,
<&conn_axi_clk>, <&conn_ipg_clk>, <&conn_ipg_clk>; <&conn_axi_clk>,
<&clk IMX_SC_R_ENET_1 IMX_SC_C_TXCLK>,
<&conn_ipg_clk>,
<&conn_ipg_clk>;
clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_1>, clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_1>,
<IMX_LPCG_CLK_2>, <IMX_LPCG_CLK_4>, <IMX_LPCG_CLK_2>, <IMX_LPCG_CLK_3>,
<IMX_LPCG_CLK_5>; <IMX_LPCG_CLK_4>, <IMX_LPCG_CLK_5>;
clock-output-names = "enet1_ipg_root_clk", clock-output-names = "enet1_lpcg_timer_clk",
"enet1_tx_clk", "enet1_lpcg_txc_sampling_clk",
"enet1_ahb_clk", "enet1_lpcg_ahb_clk",
"enet1_ipg_clk", "enet1_lpcg_rgmii_txc_clk",
"enet1_ipg_s_clk"; "enet1_lpcg_ipg_clk",
"enet1_lpcg_ipg_s_clk";
power-domains = <&pd IMX_SC_R_ENET_1>; power-domains = <&pd IMX_SC_R_ENET_1>;
}; };
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment