diff options
author | Tom Rini <trini@konsulko.com> | 2016-08-28 14:36:20 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-08-28 14:36:20 (GMT) |
commit | ff62bdfbd5dd67d37901002a35b541f2c65ad78d (patch) | |
tree | e6f3990b140ea1f469b5c16cd334404b7d3faedd /arch/arm/mach-uniphier/reset.c | |
parent | b89dfcfd926b8224edd24608065eb9bb601c0d3b (diff) | |
parent | 8d11f804130d27a8f5ed6954f3a8a7f62a10ac45 (diff) | |
download | u-boot-fsl-qoriq-ff62bdfbd5dd67d37901002a35b541f2c65ad78d.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/reset.c')
-rw-r--r-- | arch/arm/mach-uniphier/reset.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/reset.c b/arch/arm/mach-uniphier/reset.c index b5825bc..43e27d1 100644 --- a/arch/arm/mach-uniphier/reset.c +++ b/arch/arm/mach-uniphier/reset.c @@ -1,15 +1,25 @@ /* - * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com> + * Copyright (C) 2012-2014 Panasonic Corporation + * Copyright (C) 2015-2016 Socionext Inc. + * Author: Masahiro Yamada <yamada.masahiro@socionext.com> * * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <linux/io.h> +#include <asm/secure.h> #include "sc-regs.h" -void reset_cpu(unsigned long ignored) +/* If PSCI is enabled, this is used for SYSTEM_RESET function */ +#ifdef CONFIG_ARMV7_PSCI +#define __SECURE __secure +#else +#define __SECURE +#endif + +void __SECURE reset_cpu(unsigned long ignored) { u32 tmp; |