[PATCH] arm64: layerscape: Support SYSRESET

[Peng Fan]

On 9/27/2022 12:47 AM, Sean Anderson wrote:
> CONFIG_SYSRESET provides its own implementation of reset_cpu. Disable
> our version when it is enabled.
> 
> Signed-off-by: Sean Anderson <sean.anderson at seco.com>

Queued in fsl-qoriq/next

Thanks,
Peng.

> ---
> 
>   arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
> index c989a43cbeb..487c0ed5539 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
> @@ -1229,6 +1229,7 @@ int timer_init(void)
>   	return 0;
>   }
>   
> +#if !CONFIG_IS_ENABLED(SYSRESET)
>   __efi_runtime_data u32 __iomem *rstcr = (u32 *)CONFIG_SYS_FSL_RST_ADDR;
>   
>   void __efi_runtime reset_cpu(void)
> @@ -1248,6 +1249,7 @@ void __efi_runtime reset_cpu(void)
>   	scfg_out32(rstcr, val);
>   #endif
>   }
> +#endif
>   
>   #if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_PSCI_RESET)
>