arm: dts: k3-*-r5: Remove clocks from mcu_timer0

Updated PLL driver sequencing requires us to use udelay in the PLL
driver as there is no poll bit to get the status of operations.
tick-timer(mcu_timer0/main_timer0) setting up the clocks for itself is
something that won't work as the PLL driver will be using udelay and
PLLs are configured during clock probe which would end up in a recursive
probe.

tick-timer being used by K3 devices are configured by ROM and we really
don't need to configure any of the clocks.

Remove the clock dependency from R5 stage as we don't need to setup
clocks for it.

Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>

diff --git a/arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi b/arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi
index cbcc7f3..848bc35 100644 (file)
--- a/arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi
@@ -5,13 +5,3 @@
  */
 
 #include "k3-am62-lp-sk-binman.dtsi"
-
-/ {
-       chosen {
-               tick-timer = &main_timer0;
-       };
-};
-
-&main_timer0 {
-       clock-frequency = <25000000>;
-};

diff --git a/arch/arm/dts/k3-am62-r5-lp-sk.dts b/arch/arm/dts/k3-am62-r5-lp-sk.dts
index b8e5f49..135e8d4 100644 (file)
--- a/arch/arm/dts/k3-am62-r5-lp-sk.dts
+++ b/arch/arm/dts/k3-am62-r5-lp-sk.dts
@@ -12,6 +12,7 @@
 
 / {
        aliases {
+               tick-timer = &main_timer0;
                remoteproc0 = &sysctrler;
                remoteproc1 = &a53_0;
                serial0 = &wkup_uart0;
@@ -72,6 +73,14 @@
        };
 };
 
+&main_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       clock-frequency = <25000000>;
+};
+
 /* WKUP UART0 is used for DM firmware logs */
 &wkup_uart0 {
        status = "okay";

diff --git a/arch/arm/dts/k3-am625-r5-sk.dts b/arch/arm/dts/k3-am625-r5-sk.dts
index d2dd754..34c501d 100644 (file)
--- a/arch/arm/dts/k3-am625-r5-sk.dts
+++ b/arch/arm/dts/k3-am625-r5-sk.dts
@@ -12,6 +12,7 @@
 
 / {
        aliases {
+               tick-timer = &main_timer0;
                remoteproc0 = &sysctrler;
                remoteproc1 = &a53_0;
                serial0 = &wkup_uart0;
@@ -70,6 +71,14 @@
        };
 };
 
+&main_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       clock-frequency = <25000000>;
+};
+
 /* WKUP UART0 is used for DM firmware logs */
 &wkup_uart0 {
        status = "okay";

diff --git a/arch/arm/dts/k3-am625-sk-u-boot.dtsi b/arch/arm/dts/k3-am625-sk-u-boot.dtsi
index 1fc0d40..487ccf0 100644 (file)
--- a/arch/arm/dts/k3-am625-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-am625-sk-u-boot.dtsi
@@ -6,16 +6,6 @@
 
 #include "k3-am625-sk-binman.dtsi"
 
-/ {
-       chosen {
-               tick-timer = &main_timer0;
-       };
-};
-
-&main_timer0 {
-       clock-frequency = <25000000>;
-};
-
 &main_bcdma {
        reg = <0x00 0x485c0100 0x00 0x100>,
              <0x00 0x4c000000 0x00 0x20000>,

diff --git a/arch/arm/dts/k3-am62a7-r5-sk.dts b/arch/arm/dts/k3-am62a7-r5-sk.dts
index 464227b..49e6253 100644 (file)
--- a/arch/arm/dts/k3-am62a7-r5-sk.dts
+++ b/arch/arm/dts/k3-am62a7-r5-sk.dts
@@ -12,6 +12,7 @@
 
 / {
        aliases {
+               tick-timer = &main_timer0;
                remoteproc0 = &sysctrler;
                remoteproc1 = &a53_0;
        };
@@ -71,6 +72,15 @@
        };
 };
 
+&main_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       clock-frequency = <25000000>;
+       bootph-pre-ram;
+};
+
 &wkup_uart0_pins_default {
        bootph-pre-ram;
 };

diff --git a/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi b/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi
index c42dec1..7dfbeb1 100644 (file)
--- a/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi
@@ -9,7 +9,6 @@
 / {
        chosen {
                stdout-path = "serial2:115200n8";
-               tick-timer = &main_timer0;
        };
 
        memory@80000000 {
@@ -17,10 +16,6 @@
        };
 };
 
-&main_timer0 {
-       bootph-all;
-};
-
 &cbass_main {
        bootph-all;
 };

diff --git a/arch/arm/dts/k3-am62p5-r5-sk.dts b/arch/arm/dts/k3-am62p5-r5-sk.dts
index baf1a83..b18b4ce 100644 (file)
--- a/arch/arm/dts/k3-am62p5-r5-sk.dts
+++ b/arch/arm/dts/k3-am62p5-r5-sk.dts
@@ -78,6 +78,14 @@
        };
 };
 
+&main_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       clock-frequency = <25000000>;
+};
+
 /* WKUP UART0 is used for DM firmware logs */
 &wkup_uart0 {
        status = "okay";

diff --git a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
index f096b10..69bf999 100644 (file)
--- a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
+++ b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
@@ -53,6 +53,10 @@
 };
 
 &mcu_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
        clock-frequency = <250000000>;
        bootph-pre-ram;
 };

diff --git a/arch/arm/dts/k3-j721e-r5.dtsi b/arch/arm/dts/k3-j721e-r5.dtsi
index 688a6cf..786a41c 100644 (file)
--- a/arch/arm/dts/k3-j721e-r5.dtsi
+++ b/arch/arm/dts/k3-j721e-r5.dtsi
@@ -42,7 +42,11 @@
 };
 
 &mcu_timer0 {
-       status = "okay";
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       clock-frequency = <166666666>;
        bootph-pre-ram;
 };
 

diff --git a/arch/arm/dts/k3-j721s2-r5.dtsi b/arch/arm/dts/k3-j721s2-r5.dtsi
index 634676c..a820f51 100644 (file)
--- a/arch/arm/dts/k3-j721s2-r5.dtsi
+++ b/arch/arm/dts/k3-j721s2-r5.dtsi
@@ -43,6 +43,10 @@
 };
 
 &mcu_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
        clock-frequency = <250000000>;
        bootph-pre-ram;
 };

diff --git a/arch/arm/dts/k3-j722s-r5-evm.dts b/arch/arm/dts/k3-j722s-r5-evm.dts
index 5e5c2e3..08286ed 100644 (file)
--- a/arch/arm/dts/k3-j722s-r5-evm.dts
+++ b/arch/arm/dts/k3-j722s-r5-evm.dts
@@ -77,6 +77,14 @@
        };
 };
 
+&main_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       clock-frequency = <25000000>;
+};
+
 /* WKUP UART0 is used for DM firmware logs */
 &wkup_uart0 {
        status = "okay";

diff --git a/arch/arm/dts/k3-j784s4-r5.dtsi b/arch/arm/dts/k3-j784s4-r5.dtsi
index 0cd0ccc..b377a47 100644 (file)
--- a/arch/arm/dts/k3-j784s4-r5.dtsi
+++ b/arch/arm/dts/k3-j784s4-r5.dtsi
@@ -41,7 +41,10 @@
 };
 
 &mcu_timer0 {
-       status = "okay";
+       /delete-property/ clocks;
+       /delete-property/ clocks-names;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
        clock-frequency = <250000000>;
        bootph-pre-ram;
 };