arm64: dts: qcom: q[dr]u1000: move board clocks to qdu1000.dtsi file

The QDU1000 and QRU1000 devices define XO and clocks completely in the
board files, despite qdu1000.dtsi file referencing them directly. Follow
the example of other platforms and move clock definitions to the
qdu1000.dtsi file.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20241224-fix-board-clocks-v3-21-e9b08fbeadd3@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/qdu1000-idp.dts b/arch/arm64/boot/dts/qcom/qdu1000-idp.dts
index 515c2687cfad9eabc9829c905d0afb5ffd85da4e..d125fc77ae144b3b476c7880069b9417e88e8441 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qdu1000-idp.dts
+++ b/arch/arm64/boot/dts/qcom/qdu1000-idp.dts
@@ -22,20 +22,6 @@
                stdout-path = "serial0:115200n8";
        };
 
-       clocks {
-               xo_board: xo-board-clk {
-                       compatible = "fixed-clock";
-                       clock-frequency = <19200000>;
-                       #clock-cells = <0>;
-               };
-
-               sleep_clk: sleep-clk {
-                       compatible = "fixed-clock";
-                       clock-frequency = <32764>;
-                       #clock-cells = <0>;
-               };
-       };
-
        ppvar_sys: ppvar-sys-regulator {
                compatible = "regulator-fixed";
                regulator-name = "ppvar_sys";

diff --git a/arch/arm64/boot/dts/qcom/qdu1000.dtsi b/arch/arm64/boot/dts/qcom/qdu1000.dtsi
index 47c0dd31aaf2e42d6d85411956207b2509a605b0..30fa8f5f992ff5b440db9871a254b60acddbac94 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qdu1000.dtsi
+++ b/arch/arm64/boot/dts/qcom/qdu1000.dtsi
@@ -21,6 +21,20 @@
 
        chosen: chosen { };
 
+       clocks {
+               xo_board: xo-board-clk {
+                       compatible = "fixed-clock";
+                       clock-frequency = <19200000>;
+                       #clock-cells = <0>;
+               };
+
+               sleep_clk: sleep-clk {
+                       compatible = "fixed-clock";
+                       clock-frequency = <32764>;
+                       #clock-cells = <0>;
+               };
+       };
+
        cpus {
                #address-cells = <2>;
                #size-cells = <0>;

diff --git a/arch/arm64/boot/dts/qcom/qru1000-idp.dts b/arch/arm64/boot/dts/qcom/qru1000-idp.dts
index d9ad50208f59fb2a843d9a63933ca6dd714cfa95..439f5c327dc4868100984ddce43301c4c08e3a3b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qru1000-idp.dts
+++ b/arch/arm64/boot/dts/qcom/qru1000-idp.dts
@@ -22,20 +22,6 @@
                stdout-path = "serial0:115200n8";
        };
 
-       clocks {
-               xo_board: xo-board-clk {
-                       compatible = "fixed-clock";
-                       clock-frequency = <19200000>;
-                       #clock-cells = <0>;
-               };
-
-               sleep_clk: sleep-clk {
-                       compatible = "fixed-clock";
-                       clock-frequency = <32764>;
-                       #clock-cells = <0>;
-               };
-       };
-
        ppvar_sys: ppvar-sys-regulator {
                compatible = "regulator-fixed";
                regulator-name = "ppvar_sys";