From d9895571877e965a9f3e18a2a30611322099ae30 Mon Sep 17 00:00:00 2001 From: Lorenzo Pieralisi Date: Tue, 24 Mar 2015 17:58:53 +0000 Subject: ARM64: kernel: psci: let ACPI probe PSCI version PSCI v0.2+ allows the kernel to probe the PSCI firmware version. This patch replaces the default initialization of PSCI v0.2+ functions with code that allows probing PSCI firmware version and initializes PSCI functions accordingly. Cc: Sudeep Holla Cc: Mark Rutland Reviewed-by: Hanjun Guo Signed-off-by: Lorenzo Pieralisi Signed-off-by: Will Deacon --- arch/arm64/kernel/psci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch/arm64/kernel/psci.c') diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index 2caac4498154..ea18cb53921e 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -439,9 +439,7 @@ int __init psci_acpi_init(void) else invoke_psci_fn = __invoke_psci_fn_smc; - psci_0_2_set_functions(); - - return 0; + return psci_probe(); } #ifdef CONFIG_SMP -- cgit v1.2.3-59-g8ed1b