arm64: dts: ti: k3-j721e-main: Fix external refclk input to SERDES

[ Upstream commit 5c6d0b55b46aeb91355e6a9616decf50a3778c91 ]

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.

Fixes: afd094ebe69f ("arm64: dts: ti: k3-j721e-main: Add WIZ and SERDES PHY nodes")
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Reviewed-by: Aswath Govindraju <a-govindraju@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Link: https://lore.kernel.org/r/20210603143427.28735-2-kishon@ti.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
index 52e1211..7cd31ac 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
@@ -560,6 +560,10 @@
        status = "okay";
 };
 
+&cmn_refclk1 {
+       clock-frequency = <100000000>;
+};
+
 &serdes0 {
        serdes0_pcie_link: link@0 {
                reg = <0>;

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index c66ded9..6ffdebd 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -8,6 +8,20 @@
 #include <dt-bindings/mux/mux.h>
 #include <dt-bindings/mux/ti-serdes.h>
 
+/ {
+       cmn_refclk: clock-cmnrefclk {
+               #clock-cells = <0>;
+               compatible = "fixed-clock";
+               clock-frequency = <0>;
+       };
+
+       cmn_refclk1: clock-cmnrefclk1 {
+               #clock-cells = <0>;
+               compatible = "fixed-clock";
+               clock-frequency = <0>;
+       };
+};
+
 &cbass_main {
        msmc_ram: sram@70000000 {
                compatible = "mmio-sram";
@@ -369,24 +383,12 @@
                pinctrl-single,function-mask = <0xffffffff>;
        };
 
-       dummy_cmn_refclk: dummy-cmn-refclk {
-               #clock-cells = <0>;
-               compatible = "fixed-clock";
-               clock-frequency = <100000000>;
-       };
-
-       dummy_cmn_refclk1: dummy-cmn-refclk1 {
-               #clock-cells = <0>;
-               compatible = "fixed-clock";
-               clock-frequency = <100000000>;
-       };
-
        serdes_wiz0: wiz@5000000 {
                compatible = "ti,j721e-wiz-16g";
                #address-cells = <1>;
                #size-cells = <1>;
                power-domains = <&k3_pds 292 TI_SCI_PD_EXCLUSIVE>;
-               clocks = <&k3_clks 292 5>, <&k3_clks 292 11>, <&dummy_cmn_refclk>;
+               clocks = <&k3_clks 292 5>, <&k3_clks 292 11>, <&cmn_refclk>;
                clock-names = "fck", "core_ref_clk", "ext_ref_clk";
                assigned-clocks = <&k3_clks 292 11>, <&k3_clks 292 0>;
                assigned-clock-parents = <&k3_clks 292 15>, <&k3_clks 292 4>;
@@ -395,21 +397,21 @@
                ranges = <0x5000000 0x0 0x5000000 0x10000>;
 
                wiz0_pll0_refclk: pll0-refclk {
-                       clocks = <&k3_clks 292 11>, <&dummy_cmn_refclk>;
+                       clocks = <&k3_clks 292 11>, <&cmn_refclk>;
                        #clock-cells = <0>;
                        assigned-clocks = <&wiz0_pll0_refclk>;
                        assigned-clock-parents = <&k3_clks 292 11>;
                };
 
                wiz0_pll1_refclk: pll1-refclk {
-                       clocks = <&k3_clks 292 0>, <&dummy_cmn_refclk1>;
+                       clocks = <&k3_clks 292 0>, <&cmn_refclk1>;
                        #clock-cells = <0>;
                        assigned-clocks = <&wiz0_pll1_refclk>;
                        assigned-clock-parents = <&k3_clks 292 0>;
                };
 
                wiz0_refclk_dig: refclk-dig {
-                       clocks = <&k3_clks 292 11>, <&k3_clks 292 0>, <&dummy_cmn_refclk>, <&dummy_cmn_refclk1>;
+                       clocks = <&k3_clks 292 11>, <&k3_clks 292 0>, <&cmn_refclk>, <&cmn_refclk1>;
                        #clock-cells = <0>;
                        assigned-clocks = <&wiz0_refclk_dig>;
                        assigned-clock-parents = <&k3_clks 292 11>;
@@ -443,7 +445,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                power-domains = <&k3_pds 293 TI_SCI_PD_EXCLUSIVE>;
-               clocks = <&k3_clks 293 5>, <&k3_clks 293 13>, <&dummy_cmn_refclk>;
+               clocks = <&k3_clks 293 5>, <&k3_clks 293 13>, <&cmn_refclk>;
                clock-names = "fck", "core_ref_clk", "ext_ref_clk";
                assigned-clocks = <&k3_clks 293 13>, <&k3_clks 293 0>;
                assigned-clock-parents = <&k3_clks 293 17>, <&k3_clks 293 4>;
@@ -452,21 +454,21 @@
                ranges = <0x5010000 0x0 0x5010000 0x10000>;
 
                wiz1_pll0_refclk: pll0-refclk {
-                       clocks = <&k3_clks 293 13>, <&dummy_cmn_refclk>;
+                       clocks = <&k3_clks 293 13>, <&cmn_refclk>;
                        #clock-cells = <0>;
                        assigned-clocks = <&wiz1_pll0_refclk>;
                        assigned-clock-parents = <&k3_clks 293 13>;
                };
 
                wiz1_pll1_refclk: pll1-refclk {
-                       clocks = <&k3_clks 293 0>, <&dummy_cmn_refclk1>;
+                       clocks = <&k3_clks 293 0>, <&cmn_refclk1>;
                        #clock-cells = <0>;
                        assigned-clocks = <&wiz1_pll1_refclk>;
                        assigned-clock-parents = <&k3_clks 293 0>;
                };
 
                wiz1_refclk_dig: refclk-dig {
-                       clocks = <&k3_clks 293 13>, <&k3_clks 293 0>, <&dummy_cmn_refclk>, <&dummy_cmn_refclk1>;
+                       clocks = <&k3_clks 293 13>, <&k3_clks 293 0>, <&cmn_refclk>, <&cmn_refclk1>;
                        #clock-cells = <0>;
                        assigned-clocks = <&wiz1_refclk_dig>;
                        assigned-clock-parents = <&k3_clks 293 13>;
@@ -500,7 +502,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                power-domains = <&k3_pds 294 TI_SCI_PD_EXCLUSIVE>;
-               clocks = <&k3_clks 294 5>, <&k3_clks 294 11>, <&dummy_cmn_refclk>;
+               clocks = <&k3_clks 294 5>, <&k3_clks 294 11>, <&cmn_refclk>;
                clock-names = "fck", "core_ref_clk", "ext_ref_clk";
                assigned-clocks = <&k3_clks 294 11>, <&k3_clks 294 0>;
                assigned-clock-parents = <&k3_clks 294 15>, <&k3_clks 294 4>;
@@ -509,21 +511,21 @@
                ranges = <0x5020000 0x0 0x5020000 0x10000>;
 
                wiz2_pll0_refclk: pll0-refclk {
-                       clocks = <&k3_clks 294 11>, <&dummy_cmn_refclk>;
+                       clocks = <&k3_clks 294 11>, <&cmn_refclk>;
                        #clock-cells = <0>;
                        assigned-clocks = <&wiz2_pll0_refclk>;
                        assigned-clock-parents = <&k3_clks 294 11>;
                };
 
                wiz2_pll1_refclk: pll1-refclk {
-                       clocks = <&k3_clks 294 0>, <&dummy_cmn_refclk1>;
+                       clocks = <&k3_clks 294 0>, <&cmn_refclk1>;
                        #clock-cells = <0>;
                        assigned-clocks = <&wiz2_pll1_refclk>;
                        assigned-clock-parents = <&k3_clks 294 0>;
                };
 
                wiz2_refclk_dig: refclk-dig {
-                       clocks = <&k3_clks 294 11>, <&k3_clks 294 0>, <&dummy_cmn_refclk>, <&dummy_cmn_refclk1>;
+                       clocks = <&k3_clks 294 11>, <&k3_clks 294 0>, <&cmn_refclk>, <&cmn_refclk1>;
                        #clock-cells = <0>;
                        assigned-clocks = <&wiz2_refclk_dig>;
                        assigned-clock-parents = <&k3_clks 294 11>;
@@ -557,7 +559,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                power-domains = <&k3_pds 295 TI_SCI_PD_EXCLUSIVE>;
-               clocks = <&k3_clks 295 5>, <&k3_clks 295 9>, <&dummy_cmn_refclk>;
+               clocks = <&k3_clks 295 5>, <&k3_clks 295 9>, <&cmn_refclk>;
                clock-names = "fck", "core_ref_clk", "ext_ref_clk";
                assigned-clocks = <&k3_clks 295 9>, <&k3_clks 295 0>;
                assigned-clock-parents = <&k3_clks 295 13>, <&k3_clks 295 4>;
@@ -566,21 +568,21 @@
                ranges = <0x5030000 0x0 0x5030000 0x10000>;
 
                wiz3_pll0_refclk: pll0-refclk {
-                       clocks = <&k3_clks 295 9>, <&dummy_cmn_refclk>;
+                       clocks = <&k3_clks 295 9>, <&cmn_refclk>;
                        #clock-cells = <0>;
                        assigned-clocks = <&wiz3_pll0_refclk>;
                        assigned-clock-parents = <&k3_clks 295 9>;
                };
 
                wiz3_pll1_refclk: pll1-refclk {
-                       clocks = <&k3_clks 295 0>, <&dummy_cmn_refclk1>;
+                       clocks = <&k3_clks 295 0>, <&cmn_refclk1>;
                        #clock-cells = <0>;
                        assigned-clocks = <&wiz3_pll1_refclk>;
                        assigned-clock-parents = <&k3_clks 295 0>;
                };
 
                wiz3_refclk_dig: refclk-dig {
-                       clocks = <&k3_clks 295 9>, <&k3_clks 295 0>, <&dummy_cmn_refclk>, <&dummy_cmn_refclk1>;
+                       clocks = <&k3_clks 295 9>, <&k3_clks 295 0>, <&cmn_refclk>, <&cmn_refclk1>;
                        #clock-cells = <0>;
                        assigned-clocks = <&wiz3_refclk_dig>;
                        assigned-clock-parents = <&k3_clks 295 9>;