summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/sunxi/psci.c
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2016-06-19 04:38:32 (GMT)
committerHans de Goede <hdegoede@redhat.com>2016-07-15 13:54:56 (GMT)
commit94a389b257039511784b91a263913c845c8146e4 (patch)
treeb2d4f5d3931228fb270463a6f8e42dff357fbb40 /arch/arm/cpu/armv7/sunxi/psci.c
parentb52813239c10d857bd262dc850232ccccdbaa69e (diff)
downloadu-boot-fsl-qoriq-94a389b257039511784b91a263913c845c8146e4.tar.xz
sunxi: Move remaining PSCI assembly code to C
This patch finishes the rewrite of sunxi specific PSCI parts into C code. The assembly-only stack setup code has been factored out into a common function for ARMv7. The GIC setup code can be renamed as psci_arch_init. And we can use an empty stub function for psci_text_end. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'arch/arm/cpu/armv7/sunxi/psci.c')
-rw-r--r--arch/arm/cpu/armv7/sunxi/psci.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c
index a118e9d..cd0d944 100644
--- a/arch/arm/cpu/armv7/sunxi/psci.c
+++ b/arch/arm/cpu/armv7/sunxi/psci.c
@@ -250,7 +250,7 @@ void __secure psci_cpu_off(void)
wfi();
}
-void __secure sunxi_gic_init(void)
+void __secure psci_arch_init(void)
{
u32 reg;
@@ -271,3 +271,8 @@ void __secure sunxi_gic_init(void)
reg &= ~BIT(0); /* Secure mode */
cp15_write_scr(reg);
}
+
+/* dummy entry for end of psci text */
+void __secure psci_text_end(void)
+{
+}