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-phyboard-lyra-rdk-u-boot.dtsi | 5 -----
 arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts        | 8 ++++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/arch/arm/dts/k3-am625-phyboard-lyra-rdk-u-boot.dtsi 
b/arch/arm/dts/k3-am625-phyboard-lyra-rdk-u-boot.dtsi
index 
c001e2c96e8c18f6de79190eda8468f60f1a0b8a..ee273563e8346b89ccefef60d2d72d3ba0304c7f
 100644
--- a/arch/arm/dts/k3-am625-phyboard-lyra-rdk-u-boot.dtsi
+++ b/arch/arm/dts/k3-am625-phyboard-lyra-rdk-u-boot.dtsi
@@ -13,7 +13,6 @@
 / {
        chosen {
                stdout-path = "serial2:115200n8";
-               tick-timer = &main_timer0;
        };
 
        aliases {
@@ -96,10 +95,6 @@
        bootph-all;
 };
 
-&main_timer0 {
-       clock-frequency = <25000000>;
-};
-
 &main_uart0 {
        bootph-all;
 };
diff --git a/arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts 
b/arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts
index 
70154409b1275c01ea8722d5bd233ad3fac79078..7132fae36faa40266d573ece7d031b67ee0a507b
 100644
--- a/arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts
+++ b/arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts
@@ -54,6 +54,14 @@
        };
 };
 
+&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";

-- 
2.34.1

Reply via email to