Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d7bc6e4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers/firmware: Expose psci_get_version through psci_ops structure"

parents 18f6c1a5 24c543be

drivers/firmware/psci.c

+2 −0
Original line number Diff line number Diff line
@@ -431,6 +431,8 @@ static void __init psci_init_migrate(void) 
static void __init psci_0_2_set_functions(void)

{

	pr_info("Using standard PSCI v0.2 function IDs\n");

	psci_ops.get_version = psci_get_version;



	psci_function_id[PSCI_FN_CPU_SUSPEND] =

					PSCI_FN_NATIVE(0_2, CPU_SUSPEND);

	psci_ops.cpu_suspend = psci_cpu_suspend;

include/linux/psci.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ int psci_cpu_init_idle(unsigned int cpu); 
int psci_cpu_suspend_enter(unsigned long index);



struct psci_operations {

	u32 (*get_version)(void);

	int (*cpu_suspend)(u32 state, unsigned long entry_point);

	int (*cpu_off)(u32 state);

	int (*cpu_on)(unsigned long cpuid, unsigned long entry_point);