arm: dts: k3-am625-verdin-r5*: Remove clocks from main_timer0

The commit 79d91e77f4c2 ("clk: ti: clk-k3-pll: Add additional robustness
steps to the PLL sequence") introduced a change which requires the
main_timer0 to not rely on it's own clocks which anyways was wrong.

Fix it by removing the clock dependency for it, also while at it, move
it from u-boot.dtsi to R5 as that is the only entity that should require
it as DM isn't up.

Fixes: 5d1aac358f3c ("arm: dts: k3-*-r5: Remove clocks from mcu_timer0")
Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
Acked-by: Francesco Dolcini <francesco.dolcini@toradex.com>

diff --git a/arch/arm/dts/k3-am625-verdin-r5.dts b/arch/arm/dts/k3-am625-verdin-r5.dts
index 2b333e70f5c836512edc7bda273693099b3b3659..39e8ab8158e3564e404b327d6edfccacedc1b307 100644 (file)
--- a/arch/arm/dts/k3-am625-verdin-r5.dts
+++ b/arch/arm/dts/k3-am625-verdin-r5.dts
@@ -69,6 +69,14 @@
        ti,secure-host;
 };
 
+&main_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       clock-frequency = <25000000>;
+};
+
 &secure_proxy_sa3 {
        /* We require this for boot handshake */
        status = "okay";

diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi b/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi
index b3d237c869793c4adb0a2911dbd8819de5d67d70..8487ea14800492616264cd784c871f99383dc3bb 100644 (file)
--- a/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi
+++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi
@@ -12,10 +12,6 @@
                eeprom2 = &eeprom_display_adapter;
        };
 
-       chosen {
-               tick-timer = &main_timer0;
-       };
-
        memory@80000000 {
                bootph-all;
        };
@@ -25,10 +21,6 @@
        };
 };
 
-&main_timer0 {
-       clock-frequency = <25000000>;
-};
-
 &main_bcdma {
        reg = <0x00 0x485c0100 0x00 0x100>,
              <0x00 0x4c000000 0x00 0x20000>,