ARM: dts: cyclone5: Add stmmac ptp_ref clock
Subsystems (2)
PATCH 1/3 ARM: dts: cyclone5: Add stmmac ptp_ref clock
Add the ptp_ref clock to gmac0 / gmac1 specifying the default clk of osc1. The stmmac driver defaults the ptp_ref clock to the main stmmac clock if ptp_ref is not provided. This is inappropriate for the Cyclone5 or Arria5 devices.
--- arch/arm/boot/dts/socfpga.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/socfpga.dtsi +4 -4
@@ -557,8 +557,8 @@ interrupts = <0 115 4>; interrupt-names = "macirq"; mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ - clocks = <&emac_0_clk>; - clock-names = "stmmaceth"; + clocks = <&emac_0_clk>, <&osc1>; + clock-names = "stmmaceth", "ptp_ref"; resets = <&rst EMAC0_RESET>; reset-names = "stmmaceth"; snps,multicast-filter-bins = <256>;
@@ -575,8 +575,8 @@ interrupts = <0 120 4>; interrupt-names = "macirq"; mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ - clocks = <&emac_1_clk>; - clock-names = "stmmaceth"; + clocks = <&emac_1_clk>, <&osc1>; + clock-names = "stmmaceth", "ptp_ref"; resets = <&rst EMAC1_RESET>; reset-names = "stmmaceth"; snps,multicast-filter-bins = <256>;
Signature · 1 line
2.19.2
PATCH 2/3 ARM: dts: arria10: Add stmmac ptp_ref clock
Add the default stmmac ptp_ref clock for arria10. The stmmac driver defaults the ptp_ref clock to the main stmmac clock
if the ptp_ref clock is not set in the devicetree. This is inappropriate for the arria10 device. The default ptp_ref clock is peri_emac_ptp_clk.
--- arch/arm/boot/dts/socfpga_arria10.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/socfpga_arria10.dtsi +6 -6
@@ -426,8 +426,8 @@ snps,perfect-filter-entries = <128>; tx-fifo-depth = <4096>; rx-fifo-depth = <16384>; - clocks = <&l4_mp_clk>; - clock-names = "stmmaceth"; + clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>; + clock-names = "stmmaceth", "ptp_ref"; resets = <&rst EMAC0_RESET>; reset-names = "stmmaceth"; snps,axi-config = <&socfpga_axi_setup>;
@@ -446,8 +446,8 @@ snps,perfect-filter-entries = <128>; tx-fifo-depth = <4096>; rx-fifo-depth = <16384>; - clocks = <&l4_mp_clk>; - clock-names = "stmmaceth"; + clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>; + clock-names = "stmmaceth", "ptp_ref"; resets = <&rst EMAC1_RESET>; reset-names = "stmmaceth"; snps,axi-config = <&socfpga_axi_setup>;
@@ -466,8 +466,8 @@ snps,perfect-filter-entries = <128>; tx-fifo-depth = <4096>; rx-fifo-depth = <16384>; - clocks = <&l4_mp_clk>; - clock-names = "stmmaceth"; + clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>; + clock-names = "stmmaceth", "ptp_ref"; snps,axi-config = <&socfpga_axi_setup>; status = "disabled"; };
Signature · 1 line
2.19.2
Re: [PATCH 2/3] ARM: dts: arria10: Add stmmac ptp_ref clock
Quoted 38 lines · Dalon Westergreen
Add the default stmmac
ptp_refclock for arria10. The stmmac driver defaults theptp_refclock to the main stmmac clock
if theptp_refclock is not set in the devicetree. This is inappropriate for the arria10 device. The defaultptp_refclock isperi_emac_ptp_clk.Signed-off-by Dalon Westergreen <[email protected]>--- arch/arm/boot/dts/socfpga_arria10.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/arm/boot/dts/socfpga_arria10.dtsi +4
-4@@ -426,8 +426,8 @@ snps,perfect-filter-entries = <128>; tx-fifo-depth = <4096>; rx-fifo-depth = <16384>; - clocks = <&l4_mp_clk>; - clock-names = "stmmaceth"; + clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>; + clock-names = "stmmaceth", "ptp_ref"; resets = <&rst EMAC0_RESET>; reset-names = "stmmaceth"; snps,axi-config = <&socfpga_axi_setup>;@@ -446,8 +446,8 @@ snps,perfect-filter-entries = <128>; tx-fifo-depth = <4096>; rx-fifo-depth = <16384>; - clocks = <&l4_mp_clk>; - clock-names = "stmmaceth"; + clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>; + clock-names = "stmmaceth", "ptp_ref"; resets = <&rst EMAC1_RESET>; reset-names = "stmmaceth"; snps,axi-config = <&socfpga_axi_setup>;
arch/arm/boot/dts/socfpga_arria10.dtsi line 473
Quoted 10 lines
arch/arm/boot/dts/socfpga_arria10.dtsi +2
-2@@ -466,8 +466,8 @@ snps,perfect-filter-entries = <128>; tx-fifo-depth = <4096>; rx-fifo-depth = <16384>; - clocks = <&l4_mp_clk>; - clock-names = "stmmaceth"; + clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>; + clock-names = "stmmaceth", "ptp_ref"; snps,axi-config = <&socfpga_axi_setup>; status = "disabled"; };
PATCH 3/3 ARM64: dts: stratix10: Add stmmac ptp_ref clock
In reply to Dalon WestergreenAdd the default stmmac ptp_ref clock for stratix10. The stmmac driver defaults the ptp_ref clock to the main stmmac clock if the ptp_ref clock is not set in the devicetree. This is inappropriate for the stratix10. The default ptp_ref clock is STRATIX10_PERI_EMAC_PTP_CLK in the clock manager.
--- arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +6 -6
@@ -160,8 +160,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC0_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC0_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>; + clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>; rx-fifo-depth = <16384>; snps,multicast-filter-bins = <256>;
@@ -176,8 +176,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC1_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC1_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>; + clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>; rx-fifo-depth = <16384>; snps,multicast-filter-bins = <256>;
@@ -192,8 +192,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC2_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC2_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>; + clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>; rx-fifo-depth = <16384>; snps,multicast-filter-bins = <256>;
Signature · 1 line
2.19.2
Re: [PATCH 3/3] ARM64: dts: stratix10: Add stmmac ptp_ref clock
Quoted 39 lines · Dalon Westergreen
Add the default stmmac
ptp_refclock for stratix10. The stmmac driver defaults theptp_refclock to the main stmmac clock if theptp_refclock is not set in the devicetree. This is inappropriate for the stratix10. The defaultptp_refclock isSTRATIX10_PERI_EMAC_PTP_CLKin the clock manager.Signed-off-by Dalon Westergreen <[email protected]>--- arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +4
-4@@ -160,8 +160,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC0_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC0_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>; + clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>; rx-fifo-depth = <16384>; snps,multicast-filter-bins = <256>;@@ -176,8 +176,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC1_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC1_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>; + clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>; rx-fifo-depth = <16384>; snps,multicast-filter-bins = <256>;
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi line 199
Quoted 10 lines
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +2
-2@@ -192,8 +192,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC2_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC2_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>; + clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>; rx-fifo-depth = <16384>; snps,multicast-filter-bins = <256>;
Should STRATIX10_EMAC_PTP_CLK be used instead of STRATIX10_PERI_EMAC_PTP_CLK since this is the gate of the clkgmr?
Re: [PATCH 3/3] ARM64: dts: stratix10: Add stmmac ptp_ref clock
Quoted 51 lines · Thor Thayer
Quoted 50 lines · Dalon Westergreen
Add the default stmmac
ptp_refclock for stratix10. The stmmac driver defaults theptp_refclock to the main stmmac clock if theptp_refclock is not set in the devicetree. This is inappropriate for the stratix10. The defaultptp_refclock isSTRATIX10_PERI_EMAC_PTP_CLKin the clock manager.Signed-off-by: Dalon Westergreen <
[email protected]Quoted 1 line
--- arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +2
-2@@ -160,8 +160,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC0_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC0_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>; + clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>; rx-fifo-depth = <16384>;snps,multicast-filter-bins = <256>;arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +2
-2@@ -176,8 +176,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC1_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC1_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>; + clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>; rx-fifo-depth = <16384>;snps,multicast-filter-bins = <256>;arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +1
-2@@ -192,8 +192,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC2_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC2_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>;
Quoted 9 lines
Quoted 5 lines
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +1
-0+ clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>; rx-fifo-depth = <16384>;snps,multicast-filter-bins = <256>;Should
STRATIX10_EMAC_PTP_CLKbe used instead ofSTRATIX10_PERI_EMAC_PTP_CLKsince this is the gate of the clkgmr?
Either can be used, but the default in the hps configuration is the peripheral pll output and not the main pll output.
--dalon
Dinh Nguyen
maintainerRe: [PATCH 3/3] ARM64: dts: stratix10: Add stmmac ptp_ref clock
Quoted 62 lines · Dalon L Westergreen
Quoted 51 lines · Thor Thayer
Quoted 50 lines · Dalon Westergreen
Add the default stmmac
ptp_refclock for stratix10. The stmmac driver defaults theptp_refclock to the main stmmac clock if theptp_refclock is not set in the devicetree. This is inappropriate for the stratix10. The defaultptp_refclock isSTRATIX10_PERI_EMAC_PTP_CLKin the clock manager.Signed-off-by: Dalon Westergreen <
[email protected]Quoted 1 line
--- arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +2
-2@@ -160,8 +160,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC0_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC0_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>; + clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>; rx-fifo-depth = <16384>;snps,multicast-filter-bins = <256>;arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +2
-2@@ -176,8 +176,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC1_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC1_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>; + clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>; rx-fifo-depth = <16384>;snps,multicast-filter-bins = <256>;arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +1
-2@@ -192,8 +192,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC2_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC2_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>;Quoted 9 lines
Quoted 5 lines
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +1
-0+ clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>; rx-fifo-depth = <16384>;snps,multicast-filter-bins = <256>;Should
STRATIX10_EMAC_PTP_CLKbe used instead ofSTRATIX10_PERI_EMAC_PTP_CLKsince this is the gate of the clkgmr?
Quoted 3 lines
Either can be used, but the default in the hps configuration is the peripheral pll output and not the main pll output.
I think it should be the emac_ptp_clk. If you look at the clock tree, the emac_ptp_clk(50 MHz) and is derived from the peri_emac_ptp_clk(200 MHz).
You can look at the clock tree by doing a 'cat/sys/kernel/debug/clk/clk_summary'.
Dinh
Re: [PATCH 3/3] ARM64: dts: stratix10: Add stmmac ptp_ref clock
Quoted 72 lines · Dinh Nguyen
Quoted 66 lines · Dalon L Westergreen
Quoted 55 lines · Thor Thayer
Quoted 54 lines · Dalon Westergreen
Add the default stmmac
ptp_refclock for stratix10. The stmmac driver defaults theptp_refclock to the main stmmac clock if theptp_refclock is not set in the devicetree. This is inappropriate for the stratix10. The defaultptp_refclock isSTRATIX10_PERI_EMAC_PTP_CLKin the clock manager.Signed-off-by: Dalon Westergreen <
[email protected]--- arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +2
-2@@ -160,8 +160,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC0_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC0_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>; + clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>;rx-fifo-depth = <16384>; snps,multicast-filter-bins = <256>;arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +2
-2@@ -176,8 +176,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC1_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC1_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>; + clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>;rx-fifo-depth = <16384>; snps,multicast-filter-bins = <256>;arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +1
-2@@ -192,8 +192,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>; reset-names = "stmmaceth", "stmmaceth-ocp"; - clocks = <&clkmgr STRATIX10_EMAC2_CLK>; - clock-names = "stmmaceth"; + clocks = <&clkmgr STRATIX10_EMAC2_CLK>, <&clkmgr STRATIX10_PERI_EMAC_PTP_CLK>;Quoted 9 lines
Quoted 5 lines
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +1
-0+ clock-names = "stmmaceth", "ptp_ref"; tx-fifo-depth = <16384>;rx-fifo-depth = <16384>; snps,multicast-filter-bins = <256>;Should
STRATIX10_EMAC_PTP_CLKbe used instead ofSTRATIX10_PERI_EMAC_PTP_CLKsince this is the gate of the clkgmr?Quoted 3 lines
Either can be used, but the default in the hps configuration is the peripheral pll output and not the main pll output.
Quoted 9 lines
I think it should be the
emac_ptp_clk. If you look at the clock tree, theemac_ptp_clk(50 MHz)and is derived from theperi_emac_ptp_clk(200 MHz).You can look at the clock tree by doing a 'cat
/sys/kernel/debug/clk/clk_summary'.Dinh
I dont disagree, but this devicetree is a representation of what was implemented in the devkit no? Should we first request that this is changed in the design? or should i set this to STRATIX10_EMAC_PTP_CLK and overide it in the top level socdk devicetree?
dalon
Quoted 27 lines · Dalon Westergreen
Add the
ptp_refclock to gmac0 / gmac1 specifying the default clk of osc1. The stmmac driver defaults theptp_refclock to the main stmmac clock ifptp_refis not provided. This is inappropriate for the Cyclone5 or Arria5 devices.Signed-off-by Dalon Westergreen <[email protected]>--- arch/arm/boot/dts/socfpga.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/arm/boot/dts/socfpga.dtsi +2
-2@@ -557,8 +557,8 @@ interrupts = <0 115 4>; interrupt-names = "macirq"; mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ - clocks = <&emac_0_clk>; - clock-names = "stmmaceth"; + clocks = <&emac_0_clk>, <&osc1>; + clock-names = "stmmaceth", "ptp_ref"; resets = <&rst EMAC0_RESET>; reset-names = "stmmaceth"; snps,multicast-filter-bins = <256>;
arch/arm/boot/dts/socfpga.dtsi line 582
Quoted 10 lines
arch/arm/boot/dts/socfpga.dtsi +2
-2@@ -575,8 +575,8 @@ interrupts = <0 120 4>; interrupt-names = "macirq"; mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ - clocks = <&emac_1_clk>; - clock-names = "stmmaceth"; + clocks = <&emac_1_clk>, <&osc1>; + clock-names = "stmmaceth", "ptp_ref"; resets = <&rst EMAC1_RESET>; reset-names = "stmmaceth"; snps,multicast-filter-bins = <256>;