ARM: dts: stm32: Fix timer initialization for stm32 MCU's board

Commit 4b2be78ab66c ("time: Fix get_ticks being non-monotonic")
puts in evidence that get_ticks is called before timer initialization.
Fix it by initializing timer before relocation.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com>

diff --git a/arch/arm/dts/stm32429i-eval-u-boot.dtsi b/arch/arm/dts/stm32429i-eval-u-boot.dtsi
index 1e7429b2c65fd57d81bcc2bf3de83ca7fb56ca28..e75cf99f8fa459a749db7db06c947b53b0f98d2e 100644 (file)
--- a/arch/arm/dts/stm32429i-eval-u-boot.dtsi
+++ b/arch/arm/dts/stm32429i-eval-u-boot.dtsi
@@ -217,3 +217,7 @@
                };
        };
 };
+
+&timer5 {
+       u-boot,dm-pre-reloc;
+};

diff --git a/arch/arm/dts/stm32f429-disco-u-boot.dtsi b/arch/arm/dts/stm32f429-disco-u-boot.dtsi
index 77d5ea07bb5a9c8518c6eb9fb669c4a56f87412e..df99e01393a5e8213a75378bb26e40ce9565c689 100644 (file)
--- a/arch/arm/dts/stm32f429-disco-u-boot.dtsi
+++ b/arch/arm/dts/stm32f429-disco-u-boot.dtsi
@@ -192,3 +192,7 @@
 &rcc {
        u-boot,dm-pre-reloc;
 };
+
+&timer5 {
+       u-boot,dm-pre-reloc;
+};

diff --git a/arch/arm/dts/stm32f469-disco-u-boot.dtsi b/arch/arm/dts/stm32f469-disco-u-boot.dtsi
index 3cf3a6aa6f3df9b984d21c964954d93b4576699b..7223ba4a60d0ba4de01c7e9e0c48c938595a780a 100644 (file)
--- a/arch/arm/dts/stm32f469-disco-u-boot.dtsi
+++ b/arch/arm/dts/stm32f469-disco-u-boot.dtsi
@@ -235,14 +235,6 @@
        u-boot,dm-pre-reloc;
 };
 
-&rcc {
-       u-boot,dm-pre-reloc;
-};
-
-&syscfg {
-       u-boot,dm-pre-reloc;
-};
-
 &qspi {
        reg = <0xA0001000 0x1000>, <0x90000000 0x1000000>;
        flash0: n25q128a@0 {
@@ -255,3 +247,15 @@
                reg = <0>;
        };
 };
+
+&rcc {
+       u-boot,dm-pre-reloc;
+};
+
+&syscfg {
+       u-boot,dm-pre-reloc;
+};
+
+&timer5 {
+       u-boot,dm-pre-reloc;
+};

diff --git a/arch/arm/dts/stm32f746-disco-u-boot.dtsi b/arch/arm/dts/stm32f746-disco-u-boot.dtsi
index 860dd77668aa695e62ec654d67f78e1df13fdb2f..4f34fc9a8cbeca92098e7e52e0b8fae389d5cacd 100644 (file)
--- a/arch/arm/dts/stm32f746-disco-u-boot.dtsi
+++ b/arch/arm/dts/stm32f746-disco-u-boot.dtsi
@@ -239,7 +239,3 @@
                reg = <0>;
        };
 };
-
-&timer5 {
-       u-boot,dm-pre-reloc;
-};

diff --git a/arch/arm/dts/stm32h7-u-boot.dtsi b/arch/arm/dts/stm32h7-u-boot.dtsi
index 361c8e5d80f17c1bce97cfcd0083225981c29639..7182533cc954da19066755446a3444ab163599c7 100644 (file)
--- a/arch/arm/dts/stm32h7-u-boot.dtsi
+++ b/arch/arm/dts/stm32h7-u-boot.dtsi
@@ -218,3 +218,7 @@
 &sdmmc1 {
        compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell";
 };
+
+&timer5 {
+       u-boot,dm-pre-reloc;
+};