arm: dts: k3-am654: remove duplicate timer

timer1 is really just the mcu_timer0 node redefined for the WKUP SPL.
Remove the timer1 and replace it with the mcu_timer0 from the Linux
device tree we imported into U-Boot.

Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
Reviewed-by: Nishanth Menon <nm@ti.com>

diff --git a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
index 4b1e8ce2c920ca527d51597d700e7fd21065bea7..a008af5b4a047d6599ffd659c7721834b42519d0 100644 (file)
--- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
@@ -5,6 +5,18 @@
 
 #include "k3-am65x-binman.dtsi"
 
+/ {
+       chosen {
+               tick-timer = &mcu_timer0;
+       };
+};
+
+&mcu_timer0 {
+       ti,timer-alwon;
+       clock-frequency = <25000000>;
+       bootph-all;
+};
+
 &vtt_supply {
        bootph-pre-ram;
 };

diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index fb13a17b1dc646d25496d2449d87330c1b01985c..f462262b9aaac72d9eed6fe304f254398b147ed9 100644 (file)
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -26,11 +26,6 @@
                usb1 = &usb1;
        };
 
-       chosen {
-               stdout-path = "serial2:115200n8";
-               tick-timer = &timer1;
-       };
-
        a53_0: a53@0 {
                compatible = "ti,am654-rproc";
                reg = <0x0 0x00a90000 0x0 0x10>;
@@ -47,16 +42,6 @@
        };
 };
 
-&cbass_main {
-       timer1: timer@40400000 {
-               compatible = "ti,omap5430-timer";
-               reg = <0x0 0x40400000 0x0 0x80>;
-               ti,timer-alwon;
-               clock-frequency = <25000000>;
-               bootph-all;
-       };
-};
-
 &cbass_mcu {
        mcu_secproxy: secproxy@28380000 {
                compatible = "ti,am654-secure-proxy";
@@ -108,6 +93,21 @@
        };
 };
 
+/*
+ * timer init is called as part of rproc_start() while
+ * starting System Firmware, so any clock/power-domain
+ * operations will fail as SYSFW is not yet up and running.
+ * Delete all clock/power-domain properties to avoid
+ * timer init failure.
+ * This is an always on timer at 20MHz.
+ */
+&mcu_timer0 {
+       /delete-property/ clocks;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       /delete-property/ power-domains;
+};
+
 &dmsc {
        mboxes= <&mcu_secproxy 8>, <&mcu_secproxy 6>, <&mcu_secproxy 5>;
        mbox-names = "tx", "rx", "notify";