diff options
| author | Bryan Brattlof <bb@ti.com> | 2023-12-29 11:47:06 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-03 08:36:37 -0500 |
| commit | 7cf2fa8096414be4161f0dad8515ddf2ad3fc0f4 (patch) | |
| tree | 03a3a483a80028704d7a6cab8fe47d0b28553ad9 | |
| parent | 3bf9f9a35f550dfccea47b75586a956a590b303b (diff) | |
| download | u-boot-7cf2fa8096414be4161f0dad8515ddf2ad3fc0f4.tar.gz | |
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>
| -rw-r--r-- | arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 12 | ||||
| -rw-r--r-- | arch/arm/dts/k3-am654-r5-base-board.dts | 30 |
2 files changed, 27 insertions, 15 deletions
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 4b1e8ce2c9..a008af5b4a 100644 --- 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 fb13a17b1d..f462262b9a 100644 --- 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"; |