[PATCH 2/2] arm64: zynqmp: Move timeout for clock propagation below psu_init

[Michal Simek]

pá 20. 3. 2020 v 9:03 odesílatel Michal Simek <michal.simek at xilinx.com> napsal:
>
> 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 at xilinx.com>
> ---
>
>  arch/arm/mach-zynqmp/spl.c   | 3 ---
>  board/xilinx/zynqmp/zynqmp.c | 3 +++
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c
> index c53945e57f39..68df0a79c4e5 100644
> --- 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 04fd3bd0a443..eb1bc0861e2f 100644
> --- 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
> --
> 2.25.1
>

Applied.
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs