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-chawd...@ti.com>
---
 arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 8 --------
 arch/arm/dts/k3-am625-r5-beagleplay.dts      | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi 
b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi
index 
01b6a8e417ca1016cb68b5add248b10b0bd7857a..2a4f0e4536526af65cd042e17721158be45b9ce0
 100644
--- a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi
+++ b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi
@@ -9,10 +9,6 @@
 #include "k3-binman.dtsi"
 
 / {
-       chosen {
-               tick-timer = &main_timer0;
-       };
-
        /* Keep the LEDs on by default to indicate life */
        leds {
                led-0 {
@@ -37,10 +33,6 @@
        };
 };
 
-&main_timer0 {
-       clock-frequency = <25000000>;
-};
-
 &sd_pins_default {
        /* Force to use SDCD card detect pin */
        pinctrl-single,pins = <
diff --git a/arch/arm/dts/k3-am625-r5-beagleplay.dts 
b/arch/arm/dts/k3-am625-r5-beagleplay.dts
index 
9e0a6ed678448534aaa9c985b9369aa78c7815e9..c0c0c0aaa2910304e77cbfa6a1936c1feb6b1444
 100644
--- a/arch/arm/dts/k3-am625-r5-beagleplay.dts
+++ b/arch/arm/dts/k3-am625-r5-beagleplay.dts
@@ -46,6 +46,14 @@
        };
 };
 
+&main_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       clock-frequency = <25000000>;
+};
+
 &dmsc {
        mboxes= <&secure_proxy_main 0>,
                <&secure_proxy_main 1>,

-- 
2.34.1

Reply via email to