sun7i: Remove duplicate call to psci_arch_init
authorJan Kiszka <jan.kiszka@siemens.com>
Tue, 21 Apr 2015 05:18:25 +0000 (07:18 +0200)
committerHans de Goede <hdegoede@redhat.com>
Sat, 2 May 2015 09:50:19 +0000 (11:50 +0200)
This is already invoked a few cycles later in monitor mode by
_secure_monitor (_sunxi_cpu_entry calls _do_nonsec_entry which triggers
_secure_monitor via smc #0). Drop it here, it serves no purpose.

CC: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Tested-by: Ian Campbell <ijc@hellion.org.uk>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
arch/arm/cpu/armv7/sunxi/psci.S

index e0a524e10caf958a3c5ec8c689e3428a25cb9581..07b2d7619490c4795e8d73750cefe0d32d4c6d05 100644 (file)
@@ -254,7 +254,6 @@ _sunxi_cpu_entry:
        isb
 
        bl      _nonsec_init
-       bl      psci_arch_init
 
        adr     r0, _target_pc
        ldr     r0, [r0]