arm64: zynqmp: Move timeout for clock propagation below psu_init

Delay required for clock propagation is tighly coupled with initialization
done in psu_init(). That's why call it also for u-boot proper with
CONFIG_ZYNQMP_PSU_INIT_ENABLED enabled.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c
index c53945e57f39cacd5e311c9732a67119084a56cd..68df0a79c4e5e3a5ada00ae686bb1403f0a2453c 100644 (file)
--- a/arch/arm/mach-zynqmp/spl.c
+++ b/arch/arm/mach-zynqmp/spl.c
@@ -19,9 +19,6 @@ void board_init_f(ulong dummy)
 {
        board_early_init_f();
        board_early_init_r();
-
-       /* Delay is required for clocks to be propagated */
-       udelay(1000000);
 }
 
 static void ps_mode_reset(ulong mode)

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 04fd3bd0a4439cf130948c1193319d7e13d0051a..eb1bc0861e2f31a1a99e4cf1eadc84e405fb5286 100644 (file)
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -326,6 +326,9 @@ int board_early_init_f(void)
        ret = psu_init();
        if (ret)
                return ret;
+
+       /* Delay is required for clocks to be propagated */
+       udelay(1000000);
 #endif
 
 #ifdef CONFIG_DEBUG_UART