J721E: Use external clock in EVM for SERDES
Subsystems (2)
v2 cover J721E: Use external clock in EVM for SERDES
J721E EVM has clock generator that feeds both to the SERDES and to the PCIe slot present in the EVM. In order to use common reference clock on either side of the link, configure SERDES to use external reference clock.
Previously SERDES used internal reference clock and the attached device used clock from clock generator in the EVM.
Changes from v1:
1) Fixed clock names as suggested by Nishanth
2) Limit to < 100 lines
v1: http://lore.kernell.org/r/[email protected]
Kishon Vijay Abraham I (4):
arm64: dts: ti: k3-j721e-main: Fix external refclk input to SERDES
arm64: dts: ti: k3-j721e-main: Add #clock-cells property to serdes DT
node
arm64: dts: ti: k3-j721e-common-proc-board: Use external clock for
SERDES
arm64: dts: ti: k3-j721e-common-proc-board: Re-name "link" name as
"phy"
.../dts/ti/k3-j721e-common-proc-board.dts | 52 ++++++++++- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 86 +++++++++++-------- 2 files changed, 98 insertions(+), 40 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/4 arm64: dts: ti: k3-j721e-main: Fix external refclk input to SERDES
Rename the external refclk inputs to the SERDES from dummy_cmn_refclk/dummy_cmn_refclk1 to cmn_refclk/cmn_refclk1 respectively. Also move the external refclk DT nodes outside the cbass_main DT node. Since in j721e common processor board, only the cmn_refclk1 is connected to 100MHz clock, fix the clock frequency.
--- .../dts/ti/k3-j721e-common-proc-board.dts | 4 ++ arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 58 ++++++++++--------- 2 files changed, 34 insertions(+), 28 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +4 -0
@@ -635,6 +635,10 @@ status = "disabled"; }; +&cmn_refclk1 { + clock-frequency = <100000000>; +}; + &serdes0 { serdes0_pcie_link: link@0 { reg = <0>;
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +30 -28
165 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 2/4 arm64: dts: ti: k3-j721e-main: Add #clock-cells property to serdes DT node
In reply to Kishon Vijay Abraham IAdd #clock-cells property to serdes DT node since the serdes is also now modeled as a clock provider and include the input clocks "pll0_refclk" and "pll1_refclk" which are parents to the clocks modeled by serdes.
--- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 28 ++++++++++++++++------- 1 file changed, 20 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +20 -8
@@ -400,10 +400,13 @@ reg = <0x5000000 0x10000>; #address-cells = <1>; #size-cells = <0>; + #clock-cells = <1>; resets = <&serdes_wiz0 0>; reset-names = "sierra_reset"; - clocks = <&wiz0_cmn_refclk_dig_div>, <&wiz0_cmn_refclk1_dig_div>; - clock-names = "cmn_refclk_dig_div", "cmn_refclk1_dig_div"; + clocks = <&wiz0_cmn_refclk_dig_div>, <&wiz0_cmn_refclk1_dig_div>, + <&wiz0_pll0_refclk>, <&wiz0_pll1_refclk>; + clock-names = "cmn_refclk_dig_div", "cmn_refclk1_dig_div", + "pll0_refclk", "pll1_refclk"; }; };
@@ -457,10 +460,13 @@ reg = <0x5010000 0x10000>; #address-cells = <1>; #size-cells = <0>; + #clock-cells = <1>; resets = <&serdes_wiz1 0>; reset-names = "sierra_reset"; - clocks = <&wiz1_cmn_refclk_dig_div>, <&wiz1_cmn_refclk1_dig_div>; - clock-names = "cmn_refclk_dig_div", "cmn_refclk1_dig_div"; + clocks = <&wiz1_cmn_refclk_dig_div>, <&wiz1_cmn_refclk1_dig_div>, + <&wiz1_pll0_refclk>, <&wiz1_pll1_refclk>; + clock-names = "cmn_refclk_dig_div", "cmn_refclk1_dig_div", + "pll0_refclk", "pll1_refclk"; }; };
@@ -514,10 +520,13 @@ reg = <0x5020000 0x10000>; #address-cells = <1>; #size-cells = <0>; + #clock-cells = <1>; resets = <&serdes_wiz2 0>; reset-names = "sierra_reset"; - clocks = <&wiz2_cmn_refclk_dig_div>, <&wiz2_cmn_refclk1_dig_div>; - clock-names = "cmn_refclk_dig_div", "cmn_refclk1_dig_div"; + clocks = <&wiz2_cmn_refclk_dig_div>, <&wiz2_cmn_refclk1_dig_div>, + <&wiz2_pll0_refclk>, <&wiz2_pll1_refclk>; + clock-names = "cmn_refclk_dig_div", "cmn_refclk1_dig_div", + "pll0_refclk", "pll1_refclk"; }; };
@@ -571,10 +580,13 @@ reg = <0x5030000 0x10000>; #address-cells = <1>; #size-cells = <0>; + #clock-cells = <1>; resets = <&serdes_wiz3 0>; reset-names = "sierra_reset"; - clocks = <&wiz3_cmn_refclk_dig_div>, <&wiz3_cmn_refclk1_dig_div>; - clock-names = "cmn_refclk_dig_div", "cmn_refclk1_dig_div"; + clocks = <&wiz3_cmn_refclk_dig_div>, <&wiz3_cmn_refclk1_dig_div>, + <&wiz3_pll0_refclk>, <&wiz3_pll1_refclk>; + clock-names = "cmn_refclk_dig_div", "cmn_refclk1_dig_div", + "pll0_refclk", "pll1_refclk"; }; };
Signature · 1 line
2.17.1
PATCH v2 3/4 arm64: dts: ti: k3-j721e-common-proc-board: Use external clock for SERDES
In reply to Kishon Vijay Abraham IUse external clock for all the SERDES used by PCIe controller. This will make the same clock used by the local SERDES as well as the clock provided to the PCIe connector.
--- .../dts/ti/k3-j721e-common-proc-board.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+)
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +40 -0
@@ -9,6 +9,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> #include <dt-bindings/net/ti-dp83867.h> +#include <dt-bindings/phy/phy-cadence.h> / { chosen {
@@ -639,7 +640,40 @@ clock-frequency = <100000000>; }; +&wiz0_pll1_refclk { + assigned-clocks = <&wiz0_pll1_refclk>; + assigned-clock-parents = <&cmn_refclk1>; +}; + +&wiz0_refclk_dig { + assigned-clocks = <&wiz0_refclk_dig>; + assigned-clock-parents = <&cmn_refclk1>; +}; + +&wiz1_pll1_refclk { + assigned-clocks = <&wiz1_pll1_refclk>; + assigned-clock-parents = <&cmn_refclk1>; +}; + +&wiz1_refclk_dig { + assigned-clocks = <&wiz1_refclk_dig>; + assigned-clock-parents = <&cmn_refclk1>; +}; + +&wiz2_pll1_refclk { + assigned-clocks = <&wiz2_pll1_refclk>; + assigned-clock-parents = <&cmn_refclk1>; +}; + +&wiz2_refclk_dig { + assigned-clocks = <&wiz2_refclk_dig>; + assigned-clock-parents = <&cmn_refclk1>; +}; + &serdes0 { + assigned-clocks = <&serdes0 CDNS_SIERRA_PLL_CMNLC>; + assigned-clock-parents = <&wiz0_pll1_refclk>; + serdes0_pcie_link: link@0 { reg = <0>; cdns,num-lanes = <1>;
@@ -650,6 +684,9 @@ }; &serdes1 { + assigned-clocks = <&serdes1 CDNS_SIERRA_PLL_CMNLC>; + assigned-clock-parents = <&wiz1_pll1_refclk>; + serdes1_pcie_link: link@0 { reg = <0>; cdns,num-lanes = <2>;
@@ -660,6 +697,9 @@ }; &serdes2 { + assigned-clocks = <&serdes2 CDNS_SIERRA_PLL_CMNLC>; + assigned-clock-parents = <&wiz2_pll1_refclk>; + serdes2_pcie_link: link@0 { reg = <0>; cdns,num-lanes = <2>;
Signature · 1 line
2.17.1
PATCH v2 4/4 arm64: dts: ti: k3-j721e-common-proc-board: Re-name "link" name as "phy"
In reply to Kishon Vijay Abraham ICommit 66db854b1f62d ("arm64: dts: ti: k3-j721e-common-proc-board:
Configure the PCIe instances") and
commit 02c35dca2b488 ("arm64: dts: ti: k3-j721e: Enable Super-Speed support for USB0") added PHY DT nodes with node name as "link" However nodes with #phy-cells should be named 'phy' as discussed in [1]. Re-name subnodes of serdes in J721E to 'phy'.
[1] -> http://lore.kernel.org/r/20200909203631.GA3026331@bogus
--- arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +4 -4
@@ -359,7 +359,7 @@ }; &serdes3 { - serdes3_usb_link: link@0 { + serdes3_usb_link: phy@0 { reg = <0>; cdns,num-lanes = <2>; #phy-cells = <0>;
@@ -674,7 +674,7 @@ assigned-clocks = <&serdes0 CDNS_SIERRA_PLL_CMNLC>; assigned-clock-parents = <&wiz0_pll1_refclk>; - serdes0_pcie_link: link@0 { + serdes0_pcie_link: phy@0 { reg = <0>; cdns,num-lanes = <1>; #phy-cells = <0>;
@@ -687,7 +687,7 @@ assigned-clocks = <&serdes1 CDNS_SIERRA_PLL_CMNLC>; assigned-clock-parents = <&wiz1_pll1_refclk>; - serdes1_pcie_link: link@0 { + serdes1_pcie_link: phy@0 { reg = <0>; cdns,num-lanes = <2>; #phy-cells = <0>;
@@ -700,7 +700,7 @@ assigned-clocks = <&serdes2 CDNS_SIERRA_PLL_CMNLC>; assigned-clock-parents = <&wiz2_pll1_refclk>; - serdes2_pcie_link: link@0 { + serdes2_pcie_link: phy@0 { reg = <0>; cdns,num-lanes = <2>; #phy-cells = <0>;
Signature · 1 line
2.17.1
Quoted 5 lines · Kishon Vijay Abraham I
J721E EVM has clock generator that feeds both to the SERDES and to the PCIe slot present in the EVM. In order to use common reference clock on either side of the link, configure SERDES to use external reference clock.
Quoted 9 lines
Previously SERDES used internal reference clock and the attached device used clock from clock generator in the EVM.
Changes from v1:
1) Fixed clock names as suggested by Nishanth
2) Limit to < 100 lines
For the whole series,
Thanks,
Aswath
Quoted 13 lines
Kishon Vijay Abraham I (4):
arm64: dts: ti: k3-j721e-main: Fix external refclk input to SERDES
arm64: dts: ti: k3-j721e-main: Add #clock-cells property to serdes DT
node
arm64: dts: ti: k3-j721e-common-proc-board: Use external clock for
SERDES
arm64: dts: ti: k3-j721e-common-proc-board: Re-name "link" name as"phy".../dts/ti/k3-j721e-common-proc-board.dts | 52 ++++++++++- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 86 +++++++++++-------- 2 files changed, 98 insertions(+), 40 deletions(-)
Quoted 9 lines · Kishon Vijay Abraham I
J721E EVM has clock generator that feeds both to the SERDES and to the PCIe slot present in the EVM. In order to use common reference clock on either side of the link, configure SERDES to use external reference clock.
Previously SERDES used internal reference clock and the attached device used clock from clock generator in the EVM.
[...]
Hi Kishon Vijay Abraham I,
I have applied the following to branch ti-k3-dts-next on [1]. Thank you!
[1/4] arm64: dts: ti: k3-j721e-main: Fix external refclk input to SERDES
commit: 5c6d0b55b46aeb91355e6a9616decf50a3778c91
[2/4] arm64: dts: ti: k3-j721e-main: Add #clock-cells property to serdes DT node
commit: 2427bfb335eb5f291a821e91c4c520351ce933df
[3/4] arm64: dts: ti: k3-j721e-common-proc-board: Use external clock for SERDES
commit: f2a7657ad7a821de9cc77d071a5587b243144cd5
[4/4] arm64: dts: ti: k3-j721e-common-proc-board: Re-name "link" name as "phy"
commit: 02b4d9186121d842a53e347f53a86ec7f2c6b0c7All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent up the chain during the next merge window (or sooner if it is a relevant bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
[1] git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D